diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-06 11:59:47 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-06 11:59:47 +0200 |
| commit | f49d5b578cfca311654e09a5161588401fc3815a (patch) | |
| tree | 1d97f3e21bf13b4539dc4d9d934fcd3ea92516ec /mkspecs/features/resolve_config.prf | |
| parent | 848e95025297f8f56443ea7b22a1ddca1cc63cd8 (diff) | |
| parent | 0edf68120bc72d35d5fe29c84467f5afeacb0585 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I132bb6cce68e9f8413200f7ee75586bd1cada38c
Diffstat (limited to 'mkspecs/features/resolve_config.prf')
| -rw-r--r-- | mkspecs/features/resolve_config.prf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf index 7835fe4f7c..b712a2b58e 100644 --- a/mkspecs/features/resolve_config.prf +++ b/mkspecs/features/resolve_config.prf @@ -25,10 +25,13 @@ CONFIG(static, static|shared) { !macx-xcode: \ addExclusiveBuilds(shared, static) -CONFIG(debug, debug|release): \ +CONFIG(debug, debug|release) { CONFIG -= release -else: \ + !force_debug_plist:debug_and_release: \ + CONFIG += no_plist +} else { CONFIG -= debug +} !macx-xcode { addExclusiveBuilds(debug, release) |