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 /tools | |
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 '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, 8 insertions, 20 deletions
diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro index fe30f20b2..5dd649dbf 100644 --- a/tools/extractbinarydata/extractbinarydata.pro +++ b/tools/extractbinarydata/extractbinarydata.pro @@ -1,17 +1,13 @@ +include(../../installerbuilder/installerbuilder.pri) + TEMPLATE = app -DEPENDPATH += . .. ../../installerbuilder/common INCLUDEPATH += . .. - -DESTDIR = ../../installerbuilder/bin +DEPENDPATH += . .. ../../installerbuilder/common 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 8946813ae..6f9ecbff7 100644 --- a/tools/fileengineclient/fileengineclient.pro +++ b/tools/fileengineclient/fileengineclient.pro @@ -1,17 +1,13 @@ +include(../../installerbuilder/installerbuilder.pri) + TEMPLATE = app -DEPENDPATH += . .. ../../installerbuilder/common INCLUDEPATH += . .. - -DESTDIR = ../../installerbuilder/bin +DEPENDPATH += . .. ../../installerbuilder/common 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 89cd0ffc9..c087b9ec0 100644 --- a/tools/fileengineserver/fileengineserver.pro +++ b/tools/fileengineserver/fileengineserver.pro @@ -1,15 +1,11 @@ +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 |