diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-21 13:38:53 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-12-04 20:31:15 +0100 |
| commit | 41b87eeb4329b9e287d2350618c063fa1d158258 (patch) | |
| tree | 4cf80c50d8b6bf44e77c4ab99e6b225afede0c50 | |
| parent | e21fa33b9e115a0b56fb7b5cdd5f28bdcb36dca1 (diff) | |
Make QtWebKit configure report the right configuration
Debug and release configurations are mutually exclusive, so only the
last one defines the configuration. QtWebKit was however reporting
both if both were set producing confusion output.
Change-Id: If26e4ee02c922fbb880197379c6967c85746b482
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index e23f509b8..1434dc132 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -220,10 +220,9 @@ defineTest(finalizeConfigure) { log($${EOL}Final configuration:$${EOL}$${EOL}) - debug: buildConfig += debug - release: buildConfig += release - buildConfig = $$join(buildConfig,/,,) - debug:release:debug_and_release:buildConfig += (combined) + debug:release:debug_and_release: buildConfig = debug+release + else: CONFIG(debug, debug|release): buildConfig = debug + else: buildConfig = release log(Build ......................... $$build$${EOL}) log(Configuration ................. $$buildConfig$${EOL}) |