Title: [105133] trunk/Tools
- Revision
- 105133
- Author
- [email protected]
- Date
- 2012-01-17 01:28:03 -0800 (Tue, 17 Jan 2012)
Log Message
[Qt] Don't add _debug postfix to targets when building debug only
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105132 => 105133)
--- trunk/Tools/ChangeLog 2012-01-17 09:27:43 UTC (rev 105132)
+++ trunk/Tools/ChangeLog 2012-01-17 09:28:03 UTC (rev 105133)
@@ -1,5 +1,14 @@
2012-01-16 Tor Arne Vestbø <[email protected]>
+ [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ø <[email protected]>
+
[Qt] Add more files to project-files for easier navigation in Qt Creator
Reviewed by Simon Hausmann.
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (105132 => 105133)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-17 09:27:43 UTC (rev 105132)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-01-17 09:28:03 UTC (rev 105133)
@@ -187,7 +187,8 @@
# 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()
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (105132 => 105133)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2012-01-17 09:27:43 UTC (rev 105132)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2012-01-17 09:28:03 UTC (rev 105133)
@@ -232,10 +232,12 @@
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()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
