Title: [121967] trunk
- Revision
- 121967
- Author
- [email protected]
- Date
- 2012-07-06 06:23:56 -0700 (Fri, 06 Jul 2012)
Log Message
[Qt] Buildfix for newer Qt5
https://bugs.webkit.org/show_bug.cgi?id=90519
Reviewed by Tor Arne Vestbø.
Source/WebKit/qt:
* WebCoreSupport/QtFallbackWebPopup.cpp: Include QtGui/QStandardItemModel instead of deprecated QStandardItemModel.
Source/WebKit2:
* UIProcess/API/qt/qwebkittest.cpp: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h.
Tools:
* MiniBrowser/qt/MiniBrowser.pro: We also need to depend on gui-private in the MiniBrowser to get access to these headers.
* MiniBrowser/qt/MiniBrowserApplication.h: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h
* WebKitTestRunner/qt/PlatformWebViewQt.cpp: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (121966 => 121967)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-06 13:23:56 UTC (rev 121967)
@@ -1,3 +1,12 @@
+2012-07-06 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=90519
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebCoreSupport/QtFallbackWebPopup.cpp: Include QtGui/QStandardItemModel instead of deprecated QStandardItemModel.
+
2012-07-06 Oswald Buddenhagen <[email protected]>
[Qt] Adjust to changed generation of master include file
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp (121966 => 121967)
--- trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp 2012-07-06 13:23:56 UTC (rev 121967)
@@ -28,7 +28,7 @@
#include "QWebPageClient.h"
#include "qgraphicswebview.h"
#include <QGraphicsProxyWidget>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
namespace WebCore {
Modified: trunk/Source/WebKit2/ChangeLog (121966 => 121967)
--- trunk/Source/WebKit2/ChangeLog 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-06 13:23:56 UTC (rev 121967)
@@ -1,3 +1,12 @@
+2012-07-06 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=90519
+
+ Reviewed by Tor Arne Vestbø.
+
+ * UIProcess/API/qt/qwebkittest.cpp: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h.
+
2012-07-06 Oswald Buddenhagen <[email protected]>
[Qt] Adjust to changed generation of master include file
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (121966 => 121967)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp 2012-07-06 13:23:56 UTC (rev 121967)
@@ -23,9 +23,9 @@
#include "QtViewportHandler.h"
#include "qquickwebview_p_p.h"
-#include "qwindowsysteminterface_qpa.h"
#include <QMutableListIterator>
#include <QTouchEvent>
+#include <qpa/qwindowsysteminterface.h>
using namespace WebKit;
Modified: trunk/Tools/ChangeLog (121966 => 121967)
--- trunk/Tools/ChangeLog 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Tools/ChangeLog 2012-07-06 13:23:56 UTC (rev 121967)
@@ -1,3 +1,14 @@
+2012-07-06 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=90519
+
+ Reviewed by Tor Arne Vestbø.
+
+ * MiniBrowser/qt/MiniBrowser.pro: We also need to depend on gui-private in the MiniBrowser to get access to these headers.
+ * MiniBrowser/qt/MiniBrowserApplication.h: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h
+ * WebKitTestRunner/qt/PlatformWebViewQt.cpp: Include qpa/qwindowsysteminterface.h instead of deprecated qwindowsysteminterface_qpa.h
+
2012-07-06 Oswald Buddenhagen <[email protected]>
[Qt] Make use of Qt5 qmake's changed makefile recursion behavior
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (121966 => 121967)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-06 13:23:56 UTC (rev 121967)
@@ -22,7 +22,7 @@
TARGET = MiniBrowser
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT += network quick quick-private webkit webkit-private
+QT += network gui-private quick quick-private webkit webkit-private
macx: QT += xml
RESOURCES += MiniBrowser.qrc
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (121966 => 121967)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-07-06 13:23:56 UTC (rev 121967)
@@ -36,7 +36,7 @@
#include <QGuiApplication>
#include <QTouchEvent>
#include <QUrl>
-#include "qwindowsysteminterface_qpa.h"
+#include <qpa/qwindowsysteminterface.h>
class BrowserWindow;
Modified: trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (121966 => 121967)
--- trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-07-06 13:20:11 UTC (rev 121966)
+++ trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp 2012-07-06 13:23:56 UTC (rev 121967)
@@ -34,7 +34,7 @@
#include <QEventLoop>
#include <QQmlProperty>
#include <QtQuick/QQuickView>
-#include <qwindowsysteminterface_qpa.h>
+#include <qpa/qwindowsysteminterface.h>
namespace WTR {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
