diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-02-21 14:20:14 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-02-21 18:03:30 +0100 |
| commit | 6326dc3187f4c40ec938b03d256befb6d9dfc333 (patch) | |
| tree | 4f80c287c0d8bfb9e65c4ecdfc43929771e27ab6 /examples | |
| parent | 431b6dbcb8549f1cc1ff68adbd76a990ae74e088 (diff) | |
Reorganize libinstaller.pri -> installerbuilder.pri file includes.
- reorganize libinstaller.pri
- move and rename libinstaller.pri
- adjust all files that formerly included libinstaller.pri
Change-Id: I8d92ad783872fed67d6e06359ff5db46704de274
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/downloadspeed/downloadspeed.pro | 4 | ||||
| -rw-r--r-- | examples/testapp/testapp.pro | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro index e082c1f65..18495317e 100644 --- a/examples/downloadspeed/downloadspeed.pro +++ b/examples/downloadspeed/downloadspeed.pro @@ -1,4 +1,5 @@ -include(../../installerbuilder/libinstaller/libinstaller.pri) +include(../../installerbuilder/installerbuilder.pri) + DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common INCLUDEPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common @@ -9,6 +10,5 @@ TARGET = downloadspeed QT -= gui QT += core network -LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS SOURCES += main.cpp diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro index 4b1ada531..72ae3f837 100644 --- a/examples/testapp/testapp.pro +++ b/examples/testapp/testapp.pro @@ -1,20 +1,12 @@ -TEMPLATE = app -TARGET = - -include( ../../installerbuilder/libinstaller/libinstaller.pri ) -LIBS = -L$$OUT_PWD/../../installerbuilder/lib -linstaller $$LIBS +include( ../../installerbuilder/installerbuilder.pri ) +TEMPLATE = app DESTDIR = packages/com.nokia.testapp/data -QT += script network xml sql CONFIG += uitools help -contains(CONFIG, static): { - QTPLUGIN += qsqlite - DEFINES += USE_STATIC_SQLITE_PLUGIN -} +QT += script network xml sql # Input -FORMS += componentselectiondialog.ui updatesettingsdialog.ui updatesettingswidget.ui HEADERS += mainwindow.h \ componentselectiondialog.h \ updatesettingsdialog.h \ @@ -26,8 +18,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) |