diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-10-10 15:00:39 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-24 15:43:02 +0200 |
| commit | 67ddd6b22bd26293b6c487420be7062789b4301d (patch) | |
| tree | 9340721e50d383b784a2225c1d5024a3c6259913 | |
| parent | 522067849deaf6b3a942a1133351e927baa612fb (diff) | |
Fix automatic generation of examples for debug_and_release builds
Q_MAKE_EXTRA_TARGETS does generate targets both in Makefile,
Makefile.debug, and Makefile.release. Use QMAKE_EXTRA_COMPILERS
instead, which in addition will also work in generated Visual Studio
projects.
Change-Id: I29ec3760508e84c30b3afce39fc36d4e9b6c2e07
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | examples/changeuserinterface/changeuserinterface.pro | 16 | ||||
| -rw-r--r-- | examples/componenterror/componenterror.pro | 16 | ||||
| -rw-r--r-- | examples/dynamicpage/dynamicpage.pro | 16 | ||||
| -rw-r--r-- | examples/licenseagreement/licenseagreement.pro | 16 | ||||
| -rw-r--r-- | examples/modifyextract/modifyextract.pro | 16 | ||||
| -rw-r--r-- | examples/openreadme/openreadme.pro | 16 | ||||
| -rw-r--r-- | examples/quit_installer/quit_installer.pro | 16 | ||||
| -rw-r--r-- | examples/registerfileextension/registerfileextension.pro | 16 | ||||
| -rw-r--r-- | examples/startmenu/startmenu.pro | 16 |
9 files changed, 81 insertions, 63 deletions
diff --git a/examples/changeuserinterface/changeuserinterface.pro b/examples/changeuserinterface/changeuserinterface.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/changeuserinterface/changeuserinterface.pro +++ b/examples/changeuserinterface/changeuserinterface.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/componenterror/componenterror.pro b/examples/componenterror/componenterror.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/componenterror/componenterror.pro +++ b/examples/componenterror/componenterror.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/dynamicpage/dynamicpage.pro b/examples/dynamicpage/dynamicpage.pro index 083b35aee..de3af2de9 100644 --- a/examples/dynamicpage/dynamicpage.pro +++ b/examples/dynamicpage/dynamicpage.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages -r $$PWD/resources/additional.qrc installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/licenseagreement/licenseagreement.pro b/examples/licenseagreement/licenseagreement.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/licenseagreement/licenseagreement.pro +++ b/examples/licenseagreement/licenseagreement.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/modifyextract/modifyextract.pro b/examples/modifyextract/modifyextract.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/modifyextract/modifyextract.pro +++ b/examples/modifyextract/modifyextract.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/openreadme/openreadme.pro b/examples/openreadme/openreadme.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/openreadme/openreadme.pro +++ b/examples/openreadme/openreadme.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/quit_installer/quit_installer.pro b/examples/quit_installer/quit_installer.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/quit_installer/quit_installer.pro +++ b/examples/quit_installer/quit_installer.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/registerfileextension/registerfileextension.pro b/examples/registerfileextension/registerfileextension.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/registerfileextension/registerfileextension.pro +++ b/examples/registerfileextension/registerfileextension.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README diff --git a/examples/startmenu/startmenu.pro b/examples/startmenu/startmenu.pro index 7cb0de43e..de3af2de9 100644 --- a/examples/startmenu/startmenu.pro +++ b/examples/startmenu/startmenu.pro @@ -1,11 +1,13 @@ TEMPLATE = aux -OTHER_FILES = README +INSTALLER = offline + +INPUT = $$PWD/config/config.xml $$PWD/packages +example.input = INPUT +example.output = $$INSTALLER +example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages ${QMAKE_FILE_OUT} +example.CONFIG += target_predeps no_link combine -example.target = build_example -example.commands = ../../bin/binarycreator -c $$PWD/config/config.xml -p $$PWD/packages installer -QMAKE_EXTRA_TARGETS += example +QMAKE_EXTRA_COMPILERS += example -default_target.target = first -default_target.depends = example -QMAKE_EXTRA_TARGETS += default_target +OTHER_FILES = README |