[Qt] Don't add _debug postfix to targets when building debug only

Reviewed by Simon Hausmann.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f643464..b0e207e 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,14 @@
 2012-01-16  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
+        [Qt] Don't add _debug postfix to targets when building debug only
+
+        Reviewed by Simon Hausmann.
+
+        * qmake/mkspecs/features/default_post.prf:
+        * qmake/mkspecs/features/functions.prf:
+
+2012-01-16  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
         [Qt] Add more files to project-files for easier navigation in Qt Creator
 
         Reviewed by Simon Hausmann.

diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 83cd7ab..88c2c86 100644 (file)
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -187,7 +187,8 @@ contains(TEMPLATE, lib) {
     # Build both debug and release configurations
     mac: CONFIG += build_all
 
-    TARGET = $$qtLibraryTarget($$TARGET)
+    # Prevent name clashes when building both debug and release
+    debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
 
     isEmpty(DESTDIR): DESTDIR = $$activeBuildConfig()
 

diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index ced3101..4595d38 100644 (file)
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -232,10 +232,12 @@ defineTest(linkAgainstLibrary) {
 
     library = $$lower($$target)
 
-    original_template = $$TEMPLATE
-    TEMPLATE = lib # So that qtLibraryTarget works
-    target = $$qtLibraryTarget($$target)
-    TEMPLATE = $$original_template
+    debug_and_release {
+        original_template = $$TEMPLATE
+        TEMPLATE = lib # So that qtLibraryTarget works
+        target = $$qtLibraryTarget($$target)
+        TEMPLATE = $$original_template
+    }
 
     path = $$replace(source_dir, $${ROOT_WEBKIT_DIR}, $${ROOT_BUILD_DIR})/$$activeBuildConfig()