Title: [120713] trunk
- Revision
- 120713
- Author
- [email protected]
- Date
- 2012-06-19 08:15:00 -0700 (Tue, 19 Jun 2012)
Log Message
[Qt] Fix the Windows build when Qt is built without -release or -debug
https://bugs.webkit.org/show_bug.cgi?id=89471
Reviewed by Tor Arne Vestbø.
Make sure that we at least remove build_all on Windows for api.pri,
as WebCore wasn't built for all configurations.
* Source/api.pri:
Modified Paths
Diff
Modified: trunk/ChangeLog (120712 => 120713)
--- trunk/ChangeLog 2012-06-19 14:25:34 UTC (rev 120712)
+++ trunk/ChangeLog 2012-06-19 15:15:00 UTC (rev 120713)
@@ -1,3 +1,15 @@
+2012-06-19 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Fix the Windows build when Qt is built without -release or -debug
+ https://bugs.webkit.org/show_bug.cgi?id=89471
+
+ Reviewed by Tor Arne Vestbø.
+
+ Make sure that we at least remove build_all on Windows for api.pri,
+ as WebCore wasn't built for all configurations.
+
+ * Source/api.pri:
+
2012-06-19 Mike West <[email protected]>
Introduce ENABLE_CSP_NEXT configuration flag.
Modified: trunk/Source/api.pri (120712 => 120713)
--- trunk/Source/api.pri 2012-06-19 14:25:34 UTC (rev 120712)
+++ trunk/Source/api.pri 2012-06-19 15:15:00 UTC (rev 120713)
@@ -21,8 +21,12 @@
load(qt_module_config)
# 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
+ debug_and_release:if(!debug|!release) {
+ # Removing debug_and_release causes issues with lib suffixes when building debug on Windows.
+ # Work around it by only removing build_all, and still create the Makefiles for both configurations.
+ win32*: CONFIG -= build_all
+ else: 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
