From 2d532fddf8df6d766423b52344b0c4d1392119ef Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jan 2012 09:11:05 +0200 Subject: Remove build_all when target is same for debug and release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Oswald Buddenhagen --- examples/declarative/cppextensions/imageprovider/imageprovider.pro | 5 +++++ examples/declarative/cppextensions/plugins/plugins.pro | 5 +++++ examples/declarative/cppextensions/qwidgets/qwidgets.pro | 5 +++++ examples/designer/containerextension/containerextension.pro | 5 +++++ examples/designer/customwidgetplugin/customwidgetplugin.pro | 5 +++++ examples/designer/taskmenuextension/taskmenuextension.pro | 5 +++++ examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro | 5 +++++ tools/assistant/tools/assistant/assistant.pro | 4 ++++ tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro | 4 ++++ tools/assistant/tools/qhelpconverter/qhelpconverter.pro | 4 ++++ tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro | 5 +++++ tools/qdoc3/qdoc3.pro | 4 +--- tools/qml/qml.pro | 5 +++++ tools/qttracereplay/qttracereplay.pro | 4 ++++ tools/xmlpatterns/xmlpatterns.pro | 4 ++++ tools/xmlpatternsvalidator/xmlpatternsvalidator.pro | 5 +++++ 16 files changed, 71 insertions(+), 3 deletions(-) diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index ad918c3..3c761da 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -12,6 +12,11 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + ImageProviderCore_sources.files = \ ImageProviderCore/qmldir ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index e5c05e0..6029347 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -21,6 +21,11 @@ sources.files += plugins.pro plugin.cpp plugins.qml README sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + INSTALLS += qdeclarativesources sources target symbian { diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index d272180..8a9dd8d 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -11,6 +11,11 @@ sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + INSTALLS += sources target symbian:{ diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index 4991970..4e8911e 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -19,6 +19,11 @@ SOURCES += multipagewidget.cpp \ multipagewidgetextensionfactory.cpp #! [2] +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + # install target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index a39c1b0..c3c0837 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -14,6 +14,11 @@ SOURCES = analogclock.cpp \ customwidgetplugin.cpp #! [3] +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + # install target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index 9f6f429..df23ea8 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -18,6 +18,11 @@ SOURCES += tictactoe.cpp \ tictactoetaskmenu.cpp #! [2] +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + # install target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index 4da7094..28ed413 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -14,6 +14,11 @@ SOURCES = worldtimeclock.cpp \ worldtimeclockplugin.cpp #! [2] +build_all:!build_pass { + CONFIG -= build_all + CONFIG += release +} + # install target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro 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 -- cgit v0.12