diff options
| author | Max Waterman <david.waterman@nokia.com> | 2010-07-03 17:11:37 +0300 |
|---|---|---|
| committer | Jörgen Scheibengruber <jorgen.scheibengruber@nokia.com> | 2010-07-05 10:10:35 +0300 |
| commit | d32d2fbfbe79d88f269883e53ebc2c84276ff69f (patch) | |
| tree | cf96592c96748b075dfa96da5dcbd82fa08e3fe8 /examples | |
| parent | 9e56a9ac0eca787802ea9cceba9b1d5c44b73117 (diff) | |
Fixes: NB#175447 - meegotouch doesn't add dbus to QT features, but it needs...
RevBy: Jörgen
Details:
Added QT+=dbus to the meegotouch_common.prf file for unix.
Adjusted examples/{chaining,servicefw} project files to test and use new config.
Diffstat (limited to 'examples')
5 files changed, 10 insertions, 7 deletions
diff --git a/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro b/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro index 0515f7ea..1083681c 100644 --- a/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro +++ b/examples/chaining/chainingexampleinterface/chainingexampleinterface.pro @@ -1,7 +1,6 @@ TEMPLATE = lib TARGET = chainingexampleinterface CONFIG += dll meegotouch -QT += dbus system(m-servicefwgen -p com.nokia.ChainingExampleInterface) 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 6ba79936..45d4dc7c 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,7 +12,9 @@ HEADERS += \ textprocessor.h \ textprocessorinterfaceadaptor.h\ -QT += dbus gui +CONFIG += meegotouch + +QT += gui 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 ee6aa752..dd9a928f 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,7 +13,9 @@ HEADERS += \ textprocessor.h \ textprocessorinterfaceadaptor.h\ -QT += dbus gui +CONFIG += meegotouch + +QT += gui target.path = $$M_INSTALL_BIN diff --git a/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro b/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro index 2d709d00..19d428f0 100644 --- a/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro +++ b/examples/servicefw/provider/serviceif/textprocessorinterface/textprocessorinterface.pro @@ -28,7 +28,7 @@ HEADERS += \ textprocessorinterfaceproxy.h \ textprocessorinterface.h \ -QT += dbus +CONFIG += meegotouch target.path += $$[QT_INSTALL_LIBS] diff --git a/examples/servicefw/user/user.pro b/examples/servicefw/user/user.pro index 3ecbef4e..031422aa 100644 --- a/examples/servicefw/user/user.pro +++ b/examples/servicefw/user/user.pro @@ -9,6 +9,8 @@ TARGET = user DESTDIR = $$MSIF/bin TEMPLATE = app +CONFIG += meegotouch + INCLUDEPATH += \ . \ $$MSIFINCLUDE \ @@ -30,10 +32,8 @@ SOURCES = \ echowindow.cpp \ main.cpp \ -LIBS += -lmeegotouchcore - -QT += dbus LIBS += \ + -lmeegotouchcore \ -ltextprocessor \ target.path = $$M_INSTALL_BIN |