Fixes: NB#184785 - Move meegotouch-boostable QMake specification to libmeegotouch-dev

RevBy: Juha Lintula

1 files changed, 32 insertions, 31 deletions

diff --git a/doc/src/launcher.dox b/doc/src/launcher.dox
index 681009e8..8aa07f3f 100644
--- a/doc/src/launcher.dox
+++ b/doc/src/launcher.dox
@@ -81,54 +81,39 @@ of dynamic export table it is encouraged to hide the unnecessary
 symbols from the resulting binary by using \c -fvisibility=hidden and
 \c -fvisibility-inlines-hidden flags in compilation as well.
 
-\subsection pkgconfig Obtaining Flags with pkg-config
+\subsection qmaketips Building with QMake
 
-The package \c applauncherd-dev provides the necessary files for
-\c pkg-config to get the appropriate compiler and linker flags.
-To get the compiler flags, use
+\subsubsection qmakepreferred The preferred way
 
-\code
-pkg-config --cflags meegotouch-boostable
-\endcode
-
-and to get the linker flags use
+Once you have installed the \c libmeegotouch-dev package,
+you can simply use QMake configuration option \c meegotouch-boostable:
 
 \code
-pkg-config --libs meegotouch-boostable
+CONFIG += meegotouch-boostable
 \endcode
 
-See below how to use pkg-config with QMake and CMake.
+This tells qmake to use the \c meegotouch-boostable feature, which
+includes the \c meegotouch feature and ultimately uses \c pkg-config for the
+flags. Unfortunately qmake does not complain if you add the line but
+have not installed \c libmeegotouch-dev, so if the QMake magic does
+not seem to work, double check that the package is indeed installed.
 
-\subsection qmaketips Building with QMake
+\subsubsection qmakeother The pkg-config way
 
-Once you have installed the \c applauncherd-dev package,
-adding the following lines in the .pro file will provide
-the compiler and the linker the necessary flags:
+You can also use \c pkg-config to get the correct flags:
 
 \code
 QMAKE_CXXFLAGS += `pkg-config --cflags meegotouch-boostable`
 QMAKE_LFLAGS += `pkg-config --libs meegotouch-boostable`
 \endcode
 
-If \c applauncherd-dev is not installed, \c pkg-config will
+If \c libmeegotouch-dev is not installed, \c pkg-config will
 complain when you run \c make.
 
-Alternatively, you can use the QMake configuration option \c
-meegotouch-boostable (also provided in \c applauncherd-dev) and add
-the following line in the .pro file:
+\subsubsection qmakelastresort The last resort
 
-\code
-CONFIG += meegotouch-boostable
-\endcode
-
-This tells qmake to use the \c meegotouch-boostable feature, which
-ultimately uses \c pkg-config for the flags. Unfortunately qmake does
-not complain if you add the line but have not installed \c
-applauncherd-dev, so if the QMake magic does not seem to work, double
-check that the package is indeed installed.
- 
-As a last resort, you can manually define the following variables in
-the .pro file:
+It's also possible to manually define the following variables
+in the .pro file:
 
 \code
   QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
@@ -171,6 +156,22 @@ compiler and linker flags like this:
 
 Again, this requires you to update the flags if something changes.
 
+\subsection pkgconfig Obtaining Flags with pkg-config
+
+The package \c libmeegotouch-dev provides the necessary files for
+\c pkg-config to get the appropriate compiler and linker flags.
+To get the compiler flags, use
+
+\code
+pkg-config --cflags meegotouch-boostable
+\endcode
+
+and to get the linker flags use
+
+\code
+pkg-config --libs meegotouch-boostable
+\endcode
+
 \section running Running boosted application
 
 Check that applauncherd package is installed and applancherd daemon is