diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-02-21 22:27:51 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-02-21 22:28:24 +0100 |
| commit | ffd888348d985948f72b547710aba9643441150e (patch) | |
| tree | 8d5ee8b48c5f7c5ef5fa46984ca103f2febdf0a4 /examples/testapp | |
| parent | 6326dc3187f4c40ec938b03d256befb6d9dfc333 (diff) | |
Revert "Reorganize libinstaller.pri -> installerbuilder.pri file includes."
This reverts commit 6326dc3187f4c40ec938b03d256befb6d9dfc333. This breaks
shadow builds. Need to check with creator sources how to do it properly.
Change-Id: I0a9edf31abcee93b1b323ac8d8b80cc492226e29
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'examples/testapp')
| -rw-r--r-- | examples/testapp/testapp.pro | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro index 72ae3f837..48ac2b0b2 100644 --- a/examples/testapp/testapp.pro +++ b/examples/testapp/testapp.pro @@ -1,12 +1,20 @@ -include( ../../installerbuilder/installerbuilder.pri ) - TEMPLATE = app +TARGET = + +include( ../../installerbuilder/libinstaller/libinstaller.pri ) +LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS + DESTDIR = packages/com.nokia.testapp/data -CONFIG += uitools help QT += script network xml sql +CONFIG += uitools help +contains(CONFIG, static): { + QTPLUGIN += qsqlite + DEFINES += USE_STATIC_SQLITE_PLUGIN +} # Input +FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui HEADERS += mainwindow.h \ componentselectiondialog.h \ updatesettingsdialog.h \ @@ -18,8 +26,8 @@ SOURCES += main.cpp mainwindow.cpp \ updatesettingsdialog.cpp \ updateagent.cpp \ updatesettingswidget.cpp + RESOURCES += testapp.qrc -FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui macx:QMAKE_POST_LINK = ($$OUT_PWD/../../installerbuilder/bin/binarycreator -p packages -c config -t ../../installerbuilder/bin/installerbase TestAppInstaller.app com.nokia.testapp) win32:QMAKE_POST_LINK = ($$OUT_PWD\\..\\..\\installerbuilder\\bin\\binarycreator.exe -p $$PWD\\packages -c $$PWD\\config -t $$OUT_PWD\\..\\..\\installerbuilder\\bin\\installerbase.exe TestAppInstaller.exe com.nokia.testapp) |