Title: [120685] trunk
- Revision
- 120685
- Author
- [email protected]
- Date
- 2012-06-19 00:32:50 -0700 (Tue, 19 Jun 2012)
Log Message
[Qt] Fix TARGET not properly being set for QtWebKitd5.dll when building in debug.
https://bugs.webkit.org/show_bug.cgi?id=88880
load(qt_module_config) adjusts the TARGET to add the "d" suffix when doing
the debug build_pass. When doing the first pass, qt_module_config.prf doesn't
adjust the target since it is in debug_and_release and expects the debug
build_pass to come later. However, since we remove debug_and_release from CONFIG
right after this, the TARGET hasn't been adjusted and the debug build_pass
will not happen.
Work around it by disabling this optimization on Windows.
Patch by Jocelyn Turcotte <[email protected]> on 2012-06-19
Reviewed by Tor Arne Vestbø.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (120684 => 120685)
--- trunk/ChangeLog 2012-06-19 07:27:33 UTC (rev 120684)
+++ trunk/ChangeLog 2012-06-19 07:32:50 UTC (rev 120685)
@@ -1,3 +1,21 @@
+2012-06-19 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Fix TARGET not properly being set for QtWebKitd5.dll when building in debug.
+ https://bugs.webkit.org/show_bug.cgi?id=88880
+
+ load(qt_module_config) adjusts the TARGET to add the "d" suffix when doing
+ the debug build_pass. When doing the first pass, qt_module_config.prf doesn't
+ adjust the target since it is in debug_and_release and expects the debug
+ build_pass to come later. However, since we remove debug_and_release from CONFIG
+ right after this, the TARGET hasn't been adjusted and the debug build_pass
+ will not happen.
+
+ Work around it by disabling this optimization on Windows.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/api.pri:
+
2012-06-19 Mike West <[email protected]>
Add a scheme registry for bypassing Content Security Policy.
Modified: trunk/Source/api.pri (120684 => 120685)
--- trunk/Source/api.pri 2012-06-19 07:27:33 UTC (rev 120684)
+++ trunk/Source/api.pri 2012-06-19 07:32:50 UTC (rev 120685)
@@ -20,8 +20,9 @@
load(qt_module_config)
- # Make sure the module config doesn't override our preferred build config
- debug_and_release:if(!debug|!release): CONFIG -= debug_and_release
+ # Make sure the module config doesn't override our preferred build config.
+ # This cause issues with lib suffixes when building debug on Windows, disable it.
+ !win32*:debug_and_release:if(!debug|!release): CONFIG -= debug_and_release
# Allow doing a debug-only build of WebKit (not supported by Qt)
macx:!debug_and_release:debug: TARGET = $$BASE_TARGET
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
