summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-02-26 10:36:55 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2013-02-26 11:10:33 +0100
commit5e498443042eddf5a56d47f55a2b7b970eb5262e (patch)
tree79dfc9da1a08b43d8e8acd60a41bb3d291f0dfdb /examples
parentace6b7366916fce240887ec04f9dc40898da8d16 (diff)
Fix post link step and shadow build.
Change-Id: I917a211921d7d9dc7b97e7ec22983f965ad34301 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/testapp/testapp.pro17
1 files changed, 13 insertions, 4 deletions
diff --git a/examples/testapp/testapp.pro b/examples/testapp/testapp.pro
index fc981e27f..418d582ca 100644
--- a/examples/testapp/testapp.pro
+++ b/examples/testapp/testapp.pro
@@ -8,7 +8,7 @@ include(../../installerfw.pri)
warning("You can use this example only with a static build of Qt and IFW!")
}
-DESTDIR = packages/com.nokia.testapp/data
+DESTDIR = $$IFW_BUILD_TREE/examples/testapp/packages/com.nokia.testapp/data
FORMS += \
componentselectiondialog.ui \
@@ -30,7 +30,16 @@ SOURCES += main.cpp \
RESOURCES += testapp.qrc
-isEqual(IFW_SOURCE_TREE, $$IFW_BUILD_TREE) {
- macx:QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator -p $$PWD/packages -c $$PWD/config -t $$IFW_APP_PATH/installerbase TestAppInstaller.app)
- win32:QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator.exe -p $$PWD/packages -c $$PWD/config -t $$IFW_APP_PATH/installerbase.exe TestAppInstaller.exe)
+macx {
+ QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator -p $$IFW_SOURCE_TREE/examples/testapp/packages \
+ -c $$IFW_SOURCE_TREE/examples/testapp/config/config.xml -t $$IFW_APP_PATH/installerbase \
+ TestAppInstaller.app
+} win32: {
+ QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator.exe -p $$IFW_SOURCE_TREE/examples/testapp/packages \
+ -c $$IFW_SOURCE_TREE/examples/testapp/config/config.xml -t $$IFW_APP_PATH/installerbase.exe \
+ TestAppInstaller.exe)
+} else {
+ QMAKE_POST_LINK = ($$IFW_APP_PATH/binarycreator -p $$IFW_SOURCE_TREE/examples/testapp/packages \
+ -c $$IFW_SOURCE_TREE/examples/testapp/config/config.xml -t $$IFW_APP_PATH/installerbase \
+ TestAppInstaller)
}