Title: [99424] trunk/Source/WebKit2
Revision
99424
Author
hausm...@webkit.org
Date
2011-11-07 07:58:00 -0800 (Mon, 07 Nov 2011)

Log Message

[Qt] Make it possible to include qdesktopwebview.h from apps

Reviewed by Tor Arne Vestbø.

* UIProcess/API/qt/qdesktopwebview.h: Don't include C API headers, forward
declare the structs manually.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (99423 => 99424)


--- trunk/Source/WebKit2/ChangeLog	2011-11-07 15:43:21 UTC (rev 99423)
+++ trunk/Source/WebKit2/ChangeLog	2011-11-07 15:58:00 UTC (rev 99424)
@@ -1,5 +1,14 @@
 2011-11-07  Simon Hausmann  <simon.hausm...@nokia.com>
 
+        [Qt] Make it possible to include qdesktopwebview.h from apps
+
+        Reviewed by Tor Arne Vestbø.
+
+        * UIProcess/API/qt/qdesktopwebview.h: Don't include C API headers, forward
+        declare the structs manually.
+
+2011-11-07  Simon Hausmann  <simon.hausm...@nokia.com>
+
         [Qt] Fix failing inspector tests after build system changes
         https://bugs.webkit.org/show_bug.cgi?id=71677
 

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h (99423 => 99424)


--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h	2011-11-07 15:43:21 UTC (rev 99423)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h	2011-11-07 15:58:00 UTC (rev 99424)
@@ -23,7 +23,6 @@
 
 #include "qbasewebview.h"
 #include "qwebkitglobal.h"
-#include <WebKit2/WKBase.h>
 
 class QDesktopWebViewPrivate;
 
@@ -43,6 +42,10 @@
 class QWheelEvent;
 QT_END_NAMESPACE
 
+typedef const struct OpaqueWKContext* WKContextRef;
+typedef const struct OpaqueWKPageGroup* WKPageGroupRef;
+typedef const struct OpaqueWKPage* WKPageRef;
+
 namespace WTR {
     class PlatformWebView;
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to