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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/extractbinarydata/extractbinarydata.pro | 10 | ||||
| -rw-r--r-- | tools/fileengineclient/fileengineclient.pro | 10 | ||||
| -rw-r--r-- | tools/fileengineserver/fileengineserver.pro | 8 |
3 files changed, 20 insertions, 8 deletions
diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro index 5dd649dbf..fe30f20b2 100644 --- a/tools/extractbinarydata/extractbinarydata.pro +++ b/tools/extractbinarydata/extractbinarydata.pro @@ -1,13 +1,17 @@ -include(../../installerbuilder/installerbuilder.pri) - TEMPLATE = app -INCLUDEPATH += . .. DEPENDPATH += . .. ../../installerbuilder/common +INCLUDEPATH += . .. + +DESTDIR = ../../installerbuilder/bin CONFIG += console CONFIG -= app_bundle +include(../../installerbuilder/libinstaller/libinstaller.pri) + # Input SOURCES += main.cpp HEADERS += + +LIBS = -L../../installerbuilder/lib -linstaller $$LIBS diff --git a/tools/fileengineclient/fileengineclient.pro b/tools/fileengineclient/fileengineclient.pro index 6f9ecbff7..8946813ae 100644 --- a/tools/fileengineclient/fileengineclient.pro +++ b/tools/fileengineclient/fileengineclient.pro @@ -1,13 +1,17 @@ -include(../../installerbuilder/installerbuilder.pri) - TEMPLATE = app -INCLUDEPATH += . .. DEPENDPATH += . .. ../../installerbuilder/common +INCLUDEPATH += . .. + +DESTDIR = ../../installerbuilder/bin CONFIG += console CONFIG -= app_bundle QT += network +include(../../installerbuilder/libinstaller/libinstaller.pri) + # Input SOURCES += fileengineclient.cpp + +LIBS = -L../../installerbuilder/lib -linstaller $$LIBS diff --git a/tools/fileengineserver/fileengineserver.pro b/tools/fileengineserver/fileengineserver.pro index c087b9ec0..89cd0ffc9 100644 --- a/tools/fileengineserver/fileengineserver.pro +++ b/tools/fileengineserver/fileengineserver.pro @@ -1,11 +1,15 @@ -include(../../installerbuilder/installerbuilder.pri) - TEMPLATE = app DEPENDPATH += . .. ../../installerbuilder/common INCLUDEPATH += . .. +DESTDIR = ../../installerbuilder/bin + CONFIG += console CONFIG -= app_bundle +include(../../installerbuilder/libinstaller/libinstaller.pri) + # Input SOURCES += fileengineserver.cpp + +LIBS = -L../../installerbuilder/lib -linstaller $$LIBS |