summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2012-01-03 07:11:05 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-04-30 23:23:05 (GMT)
commit2d532fddf8df6d766423b52344b0c4d1392119ef (patch)
treeed6c18743baca9dfbbefe8efee181c7641de71af /tools/assistant
parenta440b8baf6b162041a3f4ae411dff81454cff2ac (diff)
downloadQt-2d532fddf8df6d766423b52344b0c4d1392119ef.zip
Qt-2d532fddf8df6d766423b52344b0c4d1392119ef.tar.gz
Qt-2d532fddf8df6d766423b52344b0c4d1392119ef.tar.bz2
Remove build_all when target is same for debug and release
Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/tools/assistant/assistant.pro4
-rw-r--r--tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro4
-rw-r--r--tools/assistant/tools/qhelpconverter/qhelpconverter.pro4
-rw-r--r--tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro5
4 files changed, 17 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro
index 7f0fdd1..c1b4fbc 100644
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -6,6 +6,10 @@ contains(QT_CONFIG, webkit):QT += webkit
CONFIG += qt \
warn_on \
help
+build_all:!build_pass {
+ CONFIG -= build_all
+ CONFIG += release
+}
QT += network
PROJECTNAME = Assistant
DESTDIR = ../../../../bin
diff --git a/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
index 98e6a31..afff9b6 100644
--- a/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
@@ -8,6 +8,10 @@ CONFIG += qt \
help \
console
CONFIG -= app_bundle
+build_all:!build_pass {
+ CONFIG -= build_all
+ CONFIG += release
+}
target.path = $$[QT_INSTALL_BINS]
INSTALLS += target
SOURCES += ../shared/helpgenerator.cpp \
diff --git a/tools/assistant/tools/qhelpconverter/qhelpconverter.pro b/tools/assistant/tools/qhelpconverter/qhelpconverter.pro
index 341faf3..a50709f 100644
--- a/tools/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/tools/assistant/tools/qhelpconverter/qhelpconverter.pro
@@ -3,6 +3,10 @@ TEMPLATE = app
TARGET = qhelpconverter
DESTDIR = ../../../../bin
CONFIG += qt warn_on help
+build_all:!build_pass {
+ CONFIG -= build_all
+ CONFIG += release
+}
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
diff --git a/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
index 68efcf5..1559ac6 100644
--- a/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+++ b/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
@@ -5,6 +5,11 @@ CONFIG += qt warn_on help console
CONFIG -= app_bundle
QT += network
+build_all:!build_pass {
+ CONFIG -= build_all
+ CONFIG += release
+}
+
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target