2011-04-08 Jamie Cooley <james.cooley@nokia.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Apr 2011 15:38:04 +0000 (15:38 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Apr 2011 15:38:04 +0000 (15:38 +0000)
        Reviewed by Benjamin Poulain.

        [Qt][WK2] Make sure qwkhistory.h is copied into includes/WebKit2
        https://bugs.webkit.org/show_bug.cgi?id=57945

        * UIProcess/API/qt/WKView.h:
        * UIProcess/API/qt/qwkhistory.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/qt/WKView.h
Source/WebKit2/UIProcess/API/qt/qwkhistory.h

index 2df4a42..58db939 100644 (file)
@@ -1,3 +1,13 @@
+2011-04-08  Jamie Cooley  <james.cooley@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt][WK2] Make sure qwkhistory.h is copied into includes/WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=57945
+
+        * UIProcess/API/qt/WKView.h:
+        * UIProcess/API/qt/qwkhistory.h:
+
 2011-04-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Reviewed by Martin Robinson.
index 5bb95e8..57a5458 100644 (file)
@@ -22,6 +22,7 @@
 
 #include <WebKit2/qgraphicswkview.h>
 #include <WebKit2/qwkcontext.h>
+#include <WebKit2/qwkhistory.h>
 #include <WebKit2/qwkpage.h>
 #include <WebKit2/qwkpreferences.h>
 
index 81081c9..cf1c842 100644 (file)
 #ifndef qwkhistory_h
 #define qwkhistory_h
 
+#include "WebKit2/WKBackForwardListItem.h"
 #include "qwebkitglobal.h"
 #include <QObject>
 #include <QSharedData>
-#include "WKBackForwardListItem.h"
 
 class QWKHistoryPrivate;
 class QWKHistoryItemPrivate;
@@ -49,7 +49,7 @@ public:
     QUrl url() const;
 
 private:
-    QWKHistoryItem(WKBackForwardListItemRef item);
+    QWKHistoryItem(WKBackForwardListItemRef);
 
     QExplicitlySharedDataPointer<QWKHistoryItemPrivate> d;