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>

9 files changed, 36 insertions, 3 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
 
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 74a5fe0..407b738 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -21,11 +21,9 @@ win32-msvc*:{
 } 
  
 !isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin
-#CONFIG += debug
 build_all:!build_pass {
     CONFIG -= build_all
-    CONFIG += debug-and-release
-#    CONFIG += debug
+    CONFIG += release
 }
 
 CONFIG -= app_bundle
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 3d1b84b..272242e 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -15,6 +15,11 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
 wince* {
     QT += xml
 
diff --git a/tools/qttracereplay/qttracereplay.pro b/tools/qttracereplay/qttracereplay.pro
index cc5b98d..a97dcda 100644
--- a/tools/qttracereplay/qttracereplay.pro
+++ b/tools/qttracereplay/qttracereplay.pro
@@ -13,3 +13,7 @@ target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
 
 CONFIG += console
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro
index 8cd321c..a5eb8a0 100644
--- a/tools/xmlpatterns/xmlpatterns.pro
+++ b/tools/xmlpatterns/xmlpatterns.pro
@@ -3,6 +3,10 @@ TARGET = xmlpatterns
 DESTDIR = ../../bin
 QT -= gui
 QT += xmlpatterns
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
 
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
index 17fc465..795bf7e 100644
--- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
+++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
@@ -4,6 +4,11 @@ DESTDIR = ../../bin
 QT -= gui
 QT += xmlpatterns
 
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target