summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/downloadspeed/downloadspeed.pro4
-rw-r--r--examples/testapp/testapp.pro16
2 files changed, 14 insertions, 6 deletions
diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro
index 18495317e..e082c1f65 100644
--- a/examples/downloadspeed/downloadspeed.pro
+++ b/examples/downloadspeed/downloadspeed.pro
@@ -1,5 +1,4 @@
-include(../../installerbuilder/installerbuilder.pri)
-
+include(../../installerbuilder/libinstaller/libinstaller.pri)
DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
INCLUDEPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
@@ -10,5 +9,6 @@ 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 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)