Changes: package the examples into an own debian package, 2nd try

RevBy: Armin, John, Mike

Details: Jani Mikkonen requested to package the parts of the
chaining example in libmeegotouch, so that he can then use
these programs for some tests where he is using fakemail
and fakegallery right now. he wanted to get rid of that
duplicated code.

when i looked a bit deeper into the build system i found
that the examples could not be built and not be packaged
in the current version. so i added that possibility to
the build system. some other examples do not have install
rules in their .pro files yet, and perhaps the
debian/meegotouch-examples.install would then need to be
expanded for the other examples too.

i verified that the chaining example does work, when installed
from the created .deb package.

In the examples subdir we do not define BUILD_M,and because
of that the "CONFIG += meegotouch" does then link against
the installed versions of libmeegotouch* in /usr/lib/.
This patch changes it to link against the libs in M_BUILD_TREE.

39 files changed, 125 insertions, 219 deletions

diff --git a/examples/apscanner/apscanner.pro b/examples/apscanner/apscanner.pro
index 8af2f460..c136cb2d 100644
--- a/examples/apscanner/apscanner.pro
+++ b/examples/apscanner/apscanner.pro
@@ -1,8 +1,8 @@
-CONFIG += meegotouch qt link_pkgconfig debug
+include( ../common.pri )
+
+CONFIG += qt link_pkgconfig debug
 TEMPLATE = app
 TARGET = apscanner
-DEPENDPATH += .
-INCLUDEPATH += .
 
 # Input
 SOURCES += main.cpp \
@@ -16,8 +16,3 @@ HEADERS += apscanner.h \
            apitemmodel.h \
            apitemcreator.h
 
-# The following lines are only to allow building the
-# example inside the source tree without installing
-# libm first:
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
diff --git a/examples/calculator/calculator.pro b/examples/calculator/calculator.pro
index ffdd1cfa..b9c1a26d 100644
--- a/examples/calculator/calculator.pro
+++ b/examples/calculator/calculator.pro
@@ -1,5 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += calculator.cpp calculatorbutton.cpp  calculatorwidget.cpp
diff --git a/examples/chaining/chainingexampleapp1/chainingexampleapp1.pro b/examples/chaining/chainingexampleapp1/chainingexampleapp1.pro
index 758a7aa4..e456e628 100644
--- a/examples/chaining/chainingexampleapp1/chainingexampleapp1.pro
+++ b/examples/chaining/chainingexampleapp1/chainingexampleapp1.pro
@@ -1,17 +1,12 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = chainingexampleapp1
-CONFIG += meegotouch 
-
-OBJECTS_DIR = ./.obj
-MOC_DIR     = ./.moc
-
-INCLUDEPATH += \
-    ../chainingexampleinterface \
 
+INCLUDEPATH += ../chainingexampleinterface
 DEPENDPATH += $$INCLUDEPATH
 
-LIBS += \
-    ../chainingexampleinterface/libchainingexampleinterface.so \
+LIBS += ../chainingexampleinterface/libchainingexampleinterface.so
 
 # Input
 SOURCES += \
@@ -21,9 +16,6 @@ SOURCES += \
 HEADERS += \
     imageviewer.h \
 
-OBJECTS_DIR = .tmp
-MOC_DIR = .tmp
-
 # target installation
 target.path = /usr/bin
 
@@ -44,4 +36,3 @@ INSTALLS += \
     prf \
     desktop \
     service \
-
diff --git a/examples/chaining/chainingexampleapp2/chainingexampleapp2.pro b/examples/chaining/chainingexampleapp2/chainingexampleapp2.pro
index ce9ddd26..1cc2313d 100644
--- a/examples/chaining/chainingexampleapp2/chainingexampleapp2.pro
+++ b/examples/chaining/chainingexampleapp2/chainingexampleapp2.pro
@@ -1,18 +1,10 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = chainingexampleapp2
-CONFIG += meegotouch 
-
-OBJECTS_DIR = ./.obj
-MOC_DIR     = ./.moc
-
-INCLUDEPATH += \
-
-DEPENDPATH += $$INCLUDEPATH
-
-LIBS += \
 
 system(cp ../chainingexampleinterface/com.nokia.ChainingExampleInterface.xml .)
-system(m-servicefwgen -a com.nokia.ChainingExampleInterface)
+system($${M_BUILD_TREE}/tools/m-servicefwgen -a com.nokia.ChainingExampleInterface)
 
 QMAKE_CLEAN += \
     com.nokia.ChainingExampleInterface.xml \
diff --git a/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro b/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro
index 1083681c..37f2957b 100644
--- a/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro
+++ b/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro
@@ -1,14 +1,17 @@
+include( ../common.pri )
+
 TEMPLATE = lib
 TARGET   = chainingexampleinterface
-CONFIG += dll meegotouch
 
-system(m-servicefwgen -p com.nokia.ChainingExampleInterface)
+system($${M_BUILD_TREE}/tools/m-servicefwgen -p com.nokia.ChainingExampleInterface)
 
-OBJECTS_DIR = ./.obj
-MOC_DIR     = ./.moc
+SOURCES += \
+    chainingexampleinterfaceproxy.cpp \
+    chainingexampleinterface.cpp
 
-SOURCES += chainingexampleinterfaceproxy.cpp chainingexampleinterface.cpp
-HEADERS += chainingexampleinterface.h chainingexampleinterfaceproxy.h
+HEADERS += \
+    chainingexampleinterface.h \
+    chainingexampleinterfaceproxy.h
 
 QMAKE_CLEAN += *.cpp *.h *~ *.so*
 
diff --git a/examples/chaining/common.pri b/examples/chaining/common.pri
new file mode 100644
index 00000000..ac98e259
--- /dev/null
+++ b/examples/chaining/common.pri
@@ -0,0 +1,6 @@
+INCLUDEPATH += ../../../src/include
+QMAKE_LIBDIR += ../../../lib/
+LIBS += -lmeegotouchcore
+
+DEPENDPATH += .
+INCLUDEPATH += .
diff --git a/examples/common.pri b/examples/common.pri
new file mode 100644
index 00000000..1e594c78
--- /dev/null
+++ b/examples/common.pri
@@ -0,0 +1,6 @@
+INCLUDEPATH += ../../src/include
+QMAKE_LIBDIR += ../../lib/
+LIBS += -lmeegotouchcore
+
+DEPENDPATH += .
+INCLUDEPATH += .
diff --git a/examples/containertest/containertest.pro b/examples/containertest/containertest.pro
index f6665078..76847103 100644
--- a/examples/containertest/containertest.pro
+++ b/examples/containertest/containertest.pro
@@ -1,15 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = containertest
-CONFIG += meegotouch 
 
 # Input
 SOURCES += main.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-# The following lines are only to allow building the
-# example inside the source tree without installing
-# libm first:
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
diff --git a/examples/examples.pro b/examples/examples.pro
index 27d0962a..e61e5181 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -3,7 +3,9 @@ SUBDIRS       = \
                 apscanner \
                 calculator \
                 containertest \
+                focus \
                 helloworld \
+                gestures \
                 layout/mflowlayoutpolicy \
                 layout/mfreestylelayoutpolicy \
                 layout/mlinearlayoutpolicy \
diff --git a/examples/focus/focus.pro b/examples/focus/focus.pro
index 5aefe43c..2c0c88da 100644
--- a/examples/focus/focus.pro
+++ b/examples/focus/focus.pro
@@ -1,6 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = focus
-CONFIG += meegotouch
 
 # Input
 SOURCES += main.cpp \
@@ -10,10 +11,3 @@ SOURCES += main.cpp \
 HEADERS += \
     mydialog.h \
     mypage.h
-
-# The following lines are only to allow building the
-# example inside the source tree without installing
-# libmeegotouch first:
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-LIBS += -lmeegotouchcore
diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro
index 95fbaed8..ecdc92c8 100644
--- a/examples/gestures/gestures.pro
+++ b/examples/gestures/gestures.pro
@@ -1,6 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-TARGET = gestures
-CONFIG += meegotouch
 
 # Input
 SOURCES += \
@@ -11,5 +11,3 @@ HEADERS += \
   mypage.h
 
 RESOURCES = images.qrc
-
-include(../insrc.pri)
diff --git a/examples/helloworld/helloworld.pro b/examples/helloworld/helloworld.pro
index 4422c71d..a3691126 100644
--- a/examples/helloworld/helloworld.pro
+++ b/examples/helloworld/helloworld.pro
@@ -1,6 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = helloworld
-CONFIG += meegotouch
 
 # Input
 SOURCES += main.cpp
diff --git a/examples/imtoolbar/imtoolbar.pro b/examples/imtoolbar/imtoolbar.pro
index 721baa00..f2cbd59a 100644
--- a/examples/imtoolbar/imtoolbar.pro
+++ b/examples/imtoolbar/imtoolbar.pro
@@ -1,19 +1,13 @@
-MROOT = ../..
-include($$MROOT/mkspecs/common.pri)
+include( ../common.pri )
 
 TEMPLATE = app
 TARGET = imtoolbar
-CONFIG += meegotouch 
-
-DEPENDPATH += .
-INCLUDEPATH += .
 
 # Input
 HEADERS += imtoolbarpage.h
 SOURCES += imtoolbarpage.cpp main.cpp
 
-install.files =  ./toolbar1.xml \
-                ./toolbar2.xml
-install.path = /usr/share/m/imtoolbars/
+install.files = toolbar1.xml \
+                toolbar2.xml
+install.path = /usr/share/meegotouch/imtoolbars/
 INSTALLS += install
-
diff --git a/examples/insrc.pri b/examples/insrc.pri
index ee7571be..e69de29b 100644
--- a/examples/insrc.pri
+++ b/examples/insrc.pri
@@ -1,6 +0,0 @@
-# The following lines are only to allow building the
-# example inside the source tree without installing
-# libmeegotouch first:
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-LIBS += -lmeegotouchcore -lmeegotouchviews
diff --git a/examples/layout/common.pri b/examples/layout/common.pri
new file mode 100644
index 00000000..ac98e259
--- /dev/null
+++ b/examples/layout/common.pri
@@ -0,0 +1,6 @@
+INCLUDEPATH += ../../../src/include
+QMAKE_LIBDIR += ../../../lib/
+LIBS += -lmeegotouchcore
+
+DEPENDPATH += .
+INCLUDEPATH += .
diff --git a/examples/layout/hidden_widgets/hidden_widgets.pro b/examples/layout/hidden_widgets/hidden_widgets.pro
index ffd3c0f3..3037ab22 100644
--- a/examples/layout/hidden_widgets/hidden_widgets.pro
+++ b/examples/layout/hidden_widgets/hidden_widgets.pro
@@ -1,5 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
diff --git a/examples/layout/layout_inside_layout/layout_inside_layout.pro b/examples/layout/layout_inside_layout/layout_inside_layout.pro
index 40c5e9fa..e6561b0b 100644
--- a/examples/layout/layout_inside_layout/layout_inside_layout.pro
+++ b/examples/layout/layout_inside_layout/layout_inside_layout.pro
@@ -1,10 +1,9 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
 
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
 
 
diff --git a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.pro b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.pro
index 40c5e9fa..3b9b765c 100644
--- a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.pro
+++ b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.pro
@@ -1,10 +1,8 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
 
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
 
diff --git a/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.pro b/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.pro
index 40c5e9fa..3037ab22 100644
--- a/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.pro
+++ b/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.pro
@@ -1,10 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
 
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.pro b/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.pro
+++ b/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.pro b/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.pro
index 40c5e9fa..3037ab22 100644
--- a/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.pro
+++ b/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.pro
@@ -1,10 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
 
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/multiplepolicies/multiplepolicies.pro b/examples/layout/multiplepolicies/multiplepolicies.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/multiplepolicies/multiplepolicies.pro
+++ b/examples/layout/multiplepolicies/multiplepolicies.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/qgraphicslayout/qgraphicslayout.pro b/examples/layout/qgraphicslayout/qgraphicslayout.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/qgraphicslayout/qgraphicslayout.pro
+++ b/examples/layout/qgraphicslayout/qgraphicslayout.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/layout/two_columns/two_columns.pro b/examples/layout/two_columns/two_columns.pro
index 40c5e9fa..96dabc82 100644
--- a/examples/layout/two_columns/two_columns.pro
+++ b/examples/layout/two_columns/two_columns.pro
@@ -1,10 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-CONFIG += meegotouch
 
 # Input
 SOURCES += *.cpp
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-
diff --git a/examples/lifecycle/lifecycle.pro b/examples/lifecycle/lifecycle.pro
index 9a459f2f..f7497d00 100644
--- a/examples/lifecycle/lifecycle.pro
+++ b/examples/lifecycle/lifecycle.pro
@@ -1,6 +1,12 @@
+include( ../common.pri )
+
+LIBS += -lmeegotouchsettings
+LIBS += -lmeegotouchviews
+LIBS += -lmeegotouchextensions
+
 TEMPLATE = app
 TARGET   = lifecycle
-CONFIG  += meegotouch
+
 SOURCES += main.cpp mainpage.cpp anotherpage.cpp containerpage.cpp
 HEADERS += mainpage.h anotherpage.h containerpage.h
 
diff --git a/examples/multipleinstances/multipleinstances.pro b/examples/multipleinstances/multipleinstances.pro
index a56e7e36..a37e2300 100644
--- a/examples/multipleinstances/multipleinstances.pro
+++ b/examples/multipleinstances/multipleinstances.pro
@@ -1,13 +1,7 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = multipleInstances
-CONFIG += meegotouch
 
 # Input
 SOURCES += main.cpp
-
-# The following lines are only to allow building the
-# example inside the source tree without installing
-# libm first:
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-LIBS += -lmeegotouchcore
diff --git a/examples/pagenavigation_drilldown/pagenavigation_drilldown.pro b/examples/pagenavigation_drilldown/pagenavigation_drilldown.pro
index 4ef344a4..1e767b09 100644
--- a/examples/pagenavigation_drilldown/pagenavigation_drilldown.pro
+++ b/examples/pagenavigation_drilldown/pagenavigation_drilldown.pro
@@ -1,8 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG += meegotouch
 
 # Input
 HEADERS += samplepage.h
diff --git a/examples/pagenavigation_menu/pagenavigation_menu.pro b/examples/pagenavigation_menu/pagenavigation_menu.pro
index cf929166..07186985 100644
--- a/examples/pagenavigation_menu/pagenavigation_menu.pro
+++ b/examples/pagenavigation_menu/pagenavigation_menu.pro
@@ -1,8 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG += meegotouch
 
 # Input
 HEADERS += samplewindow.h
diff --git a/examples/pagenavigation_tab/pagenavigation_tab.pro b/examples/pagenavigation_tab/pagenavigation_tab.pro
index cf929166..07186985 100644
--- a/examples/pagenavigation_tab/pagenavigation_tab.pro
+++ b/examples/pagenavigation_tab/pagenavigation_tab.pro
@@ -1,8 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG += meegotouch
 
 # Input
 HEADERS += samplewindow.h
diff --git a/examples/separatorTest/separatorTest.pro b/examples/separatorTest/separatorTest.pro
index 97c317e1..77beb3fd 100644
--- a/examples/separatorTest/separatorTest.pro
+++ b/examples/separatorTest/separatorTest.pro
@@ -1,32 +1,14 @@
+include( ../common.pri )
+include( ../../mkspecs/common.pri )
+
 TEMPLATE = app
 TARGET = SeparatorTest
-CONFIG += meegotouch 
 
 # Input
 SOURCES += main.cpp SeparatorTestPage.cpp
 
-MROOT = ../..
-
-include($$MROOT/mkspecs/common.pri)
-
-MLIB = $$MROOT/lib
-MSRC = $$MROOT/src
-MSRCINCLUDE = $$MSRC/include
-MSFWINCLUDE = $$MROOT/servicefw/include
-
-INCLUDEPATH += . \
-    $$MSRCINCLUDE \
-    $$MSRC \
-
-QMAKE_LIBDIR += \
-    $$MLIB \
-
-INCLUDEPATH += ../../src/include
-QMAKE_LIBDIR += ../../lib/
-
-style_sheet.path = $$M_THEME_DIR/SeparatorTest
 style_sheet.files = style/SeparatorTest.css
-view_configuration.path = $$M_THEME_DIR/SeparatorTest
+style_sheet.path = $$M_THEME_DIR/base/meegotouch/SeparatorTest/style
 
 INSTALLS += \
     style_sheet \
diff --git a/examples/servicefw/provider/impl/com.nokia.textprocessor/com.nokia.textprocessor.pro b/examples/servicefw/provider/impl/com.nokia.textprocessor/com.nokia.textprocessor.pro
index 45d4dc7c..c56e7c96 100644
--- a/examples/servicefw/provider/impl/com.nokia.textprocessor/com.nokia.textprocessor.pro
+++ b/examples/servicefw/provider/impl/com.nokia.textprocessor/com.nokia.textprocessor.pro
@@ -12,9 +12,7 @@ HEADERS += \
     textprocessor.h \
     textprocessorinterfaceadaptor.h\
 
-CONFIG += meegotouch
-
-QT += gui
+QT += gui dbus
 
 target.path = $$M_INSTALL_BIN
 
diff --git a/examples/servicefw/provider/impl/org.maemo.textprocessor/org.maemo.textprocessor.pro b/examples/servicefw/provider/impl/org.maemo.textprocessor/org.maemo.textprocessor.pro
index dd9a928f..677405f8 100644
--- a/examples/servicefw/provider/impl/org.maemo.textprocessor/org.maemo.textprocessor.pro
+++ b/examples/servicefw/provider/impl/org.maemo.textprocessor/org.maemo.textprocessor.pro
@@ -13,9 +13,7 @@ HEADERS += \
     textprocessor.h \
     textprocessorinterfaceadaptor.h\
 
-CONFIG += meegotouch
-
-QT += gui
+QT += gui dbus
 
 target.path = $$M_INSTALL_BIN
 
diff --git a/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro b/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro
index 19d428f0..20bb529d 100644
--- a/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro
+++ b/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro
@@ -1,7 +1,10 @@
 MROOT = ../../../../..
 include($$MROOT/mkspecs/common.pri)
 
-system(m-servicefwgen -p com.nokia.TextProcessorInterface)
+# for M_DBUS_INTERFACES_DIR
+include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf)
+
+system($$M_BUILD_TREE/tools/m-servicefwgen -p com.nokia.TextProcessorInterface)
 
 MLIB = $$MROOT/lib
 MSIF = $$MROOT/examples/servicefw
@@ -16,7 +19,7 @@ INCLUDEPATH += \
     $$MSIFINCLUDE \
     $$MROOT/src/include \
 
-DEPENTPATH += $$INCLUDEPATH
+DEPENDPATH += $$INCLUDEPATH
 TARGET = textprocessor
 DESTDIR = $$MSIFLIB
 TEMPLATE = lib
@@ -28,8 +31,6 @@ HEADERS += \
     textprocessorinterfaceproxy.h \
     textprocessorinterface.h \
 
-CONFIG += meegotouch
-
 target.path += $$[QT_INSTALL_LIBS]
 
 headers.target = .dummy
diff --git a/examples/servicefw/user/user.pro b/examples/servicefw/user/user.pro
index 031422aa..cda5e8f5 100644
--- a/examples/servicefw/user/user.pro
+++ b/examples/servicefw/user/user.pro
@@ -9,8 +9,6 @@ TARGET     = user
 DESTDIR = $$MSIF/bin
 TEMPLATE   = app
 
-CONFIG += meegotouch
-
 INCLUDEPATH += \
     . \
     $$MSIFINCLUDE \
diff --git a/examples/testwidget/testwidget.pro b/examples/testwidget/testwidget.pro
index f06de305..6706418a 100644
--- a/examples/testwidget/testwidget.pro
+++ b/examples/testwidget/testwidget.pro
@@ -1,6 +1,25 @@
+include( ../common.pri )
+include( ../../mkspecs/common.pri )
+
+# make sure mgen executable is found
+win32 {
+    debug {
+        M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/debug/mgen.exe
+    } else {
+        M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/release/mgen.exe
+    }
+} else {
+    M_MGEN_EXECUTABLE = $$M_BUILD_TREE/mgen/mgen
+}
+
+include( ../../mkspecs/features/meegotouch_mgen.prf )
+
+LIBS += -lmeegotouchsettings
+LIBS += -lmeegotouchviews
+LIBS += -lmeegotouchextensions
+
 TEMPLATE = app
 TARGET = testwidget
-CONFIG += meegotouch 
 
 # Input
 SOURCES += testwidgetmodel.cpp \
diff --git a/examples/trackergrid/trackergrid.pro b/examples/trackergrid/trackergrid.pro
index 5301a816..5ee6cf30 100644
--- a/examples/trackergrid/trackergrid.pro
+++ b/examples/trackergrid/trackergrid.pro
@@ -1,35 +1,10 @@
+include( ../common.pri )
+
 TEMPLATE = app
 TARGET = trackergrid
-CONFIG += meegotouch 
 LIBS += -lqttracker # Requires libqttracker + tracker
 
 # Input
 SOURCES += main.cpp trackergridpage.cpp
 HEADERS += trackergridpage.h
 
-# MROOT = ../..
-#
-# include($$MROOT/mkspecs/common.pri)
-#
-# MLIB = $$MROOT/lib
-# MSRC = $$MROOT/src
-# MSRCINCLUDE = $$MSRC/include
-# MSFWINCLUDE = $$MROOT/servicefw/include
-#
-# INCLUDEPATH += . \
-#     $$MSRCINCLUDE \
-#     $$MSRC \
-#
-# QMAKE_LIBDIR += \
-#    $$MLIB \
-#
-# INCLUDEPATH += ../../src/include
-# QMAKE_LIBDIR += ../../lib/
-#
-# style_sheet.path = $$M_THEME_DIR/trackergrid
-# style_sheet.files = style/trackergrid.css
-# view_configuration.path = $$M_THEME_DIR/trackergrid
-#
-# INSTALLS += \
-#    style_sheet \
-
diff --git a/examples/tutorial_music_catalogue/tutorial_music_catalogue.pro b/examples/tutorial_music_catalogue/tutorial_music_catalogue.pro
index e504eac1..ecafcf75 100644
--- a/examples/tutorial_music_catalogue/tutorial_music_catalogue.pro
+++ b/examples/tutorial_music_catalogue/tutorial_music_catalogue.pro
@@ -1,8 +1,6 @@
+include( ../common.pri )
+
 TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-CONFIG += meegotouch
 
 # Input
 HEADERS += albumpage.h data.h mainpage.h artistpage.h