Title: [128033] trunk/Source/WebKit2
- Revision
- 128033
- Author
- [email protected]
- Date
- 2012-09-10 02:09:14 -0700 (Mon, 10 Sep 2012)
Log Message
[WK2] Make WK2 C API headers compile in the Qt build on Windows
https://bugs.webkit.org/show_bug.cgi?id=96246
Patch by Simon Hausmann <[email protected]> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.
WKBase.h and WKAPICast.h include files that are specific to the Safari/Windows
port if WIN32 or _WIN32 is defined. When building WebKit2 on Windows with Qt, we
do not want to include these files, as they define an API that is different to ours
(the view aspect differs). Therefore guard the inclusion with !defined(BUILDING_QT__)
* Shared/API/c/WKBase.h:
* UIProcess/API/C/WKAPICast.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (128032 => 128033)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 08:57:27 UTC (rev 128032)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 09:09:14 UTC (rev 128033)
@@ -1,3 +1,18 @@
+2012-09-10 Simon Hausmann <[email protected]>
+
+ [WK2] Make WK2 C API headers compile in the Qt build on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=96246
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ WKBase.h and WKAPICast.h include files that are specific to the Safari/Windows
+ port if WIN32 or _WIN32 is defined. When building WebKit2 on Windows with Qt, we
+ do not want to include these files, as they define an API that is different to ours
+ (the view aspect differs). Therefore guard the inclusion with !defined(BUILDING_QT__)
+
+ * Shared/API/c/WKBase.h:
+ * UIProcess/API/C/WKAPICast.h:
+
2012-09-10 Kevin Funk <[email protected]>
Replace calls to QString::fromAscii which is deprecated in Qt5
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (128032 => 128033)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2012-09-10 08:57:27 UTC (rev 128032)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2012-09-10 09:09:14 UTC (rev 128033)
@@ -29,7 +29,7 @@
#include <stdint.h>
-#if defined(WIN32) || defined(_WIN32)
+#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
#include <WebKit2/WKBaseWin.h>
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (128032 => 128033)
--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2012-09-10 08:57:27 UTC (rev 128032)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2012-09-10 09:09:14 UTC (rev 128033)
@@ -423,7 +423,7 @@
} // namespace WebKit
-#if defined(WIN32) || defined(_WIN32)
+#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
#include "WKAPICastWin.h"
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
