Title: [128459] trunk/Source/WebKit2
- Revision
- 128459
- Author
- [email protected]
- Date
- 2012-09-13 07:58:35 -0700 (Thu, 13 Sep 2012)
Log Message
[Qt] Fix build of WTR and the QML2 plugin on Windows
https://bugs.webkit.org/show_bug.cgi?id=96652
Reviewed by Tor Arne Vestbø.
Some components that we build such as WTR or the QML2 plugin include
WebKit2 header files as well as WebKit2's config.h. Only the include
paths of WebKit2 are required for that at the moment (WEBKIT +=
webkit2). Only on Windows WebKit2's config.h also includes
WebCore/config.h, which in turn requires to have WebCore/platform in
your include search path. That in turn means that any component that
wants to use WebKit2 headers also needs the WebCore headers, but only
one Windows. It turns out that for the Qt build we don't need it, so
skip it in our configuration and make the include path requirement
the same across all the platforms we build.
* config.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128458 => 128459)
--- trunk/Source/WebKit2/ChangeLog 2012-09-13 14:56:48 UTC (rev 128458)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-13 14:58:35 UTC (rev 128459)
@@ -1,3 +1,23 @@
+2012-09-13 Simon Hausmann <[email protected]>
+
+ [Qt] Fix build of WTR and the QML2 plugin on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=96652
+
+ Reviewed by Tor Arne Vestbø.
+
+ Some components that we build such as WTR or the QML2 plugin include
+ WebKit2 header files as well as WebKit2's config.h. Only the include
+ paths of WebKit2 are required for that at the moment (WEBKIT +=
+ webkit2). Only on Windows WebKit2's config.h also includes
+ WebCore/config.h, which in turn requires to have WebCore/platform in
+ your include search path. That in turn means that any component that
+ wants to use WebKit2 headers also needs the WebCore headers, but only
+ one Windows. It turns out that for the Qt build we don't need it, so
+ skip it in our configuration and make the include path requirement
+ the same across all the platforms we build.
+
+ * config.h:
+
2012-09-13 Andras Becsi <[email protected]>
[Qt][WK2] REGRESSION(r128245): It made zillion API tests fail
Modified: trunk/Source/WebKit2/config.h (128458 => 128459)
--- trunk/Source/WebKit2/config.h 2012-09-13 14:56:48 UTC (rev 128458)
+++ trunk/Source/WebKit2/config.h 2012-09-13 14:58:35 UTC (rev 128459)
@@ -82,7 +82,9 @@
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
#endif
+#if !PLATFORM(QT)
#include <WebCore/config.h>
+#endif
#include <windows.h>
#if USE(CG)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
