Title: [107221] trunk/Source/WebKit/qt
- Revision
- 107221
- Author
- [email protected]
- Date
- 2012-02-09 04:50:46 -0800 (Thu, 09 Feb 2012)
Log Message
[Qt] Fix compilation with newer Qt5
https://bugs.webkit.org/show_bug.cgi?id=77653
Patch by Simon Hausmann <[email protected]> on 2012-02-09
Reviewed by Tor Arne Vestbø.
* Api/qgraphicswebview.cpp: Removed unnecessary inclusion of removed header file.
* declarative/public.pri: Use quick1 instead of qtquick1. It's mandator with Qt 5.
* tests/tests.pri: Ditto.
* declarative/qdeclarativewebview_p.h: Fix includes, just use the module-less
version that works with all Qt versions.
* tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp (107220 => 107221)
--- trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-02-09 12:50:46 UTC (rev 107221)
@@ -40,7 +40,6 @@
#include <qgraphicsview.h>
#include <qscrollbar.h>
#include <qstyleoption.h>
-#include <qinputcontext.h>
#include <QtCore/qmetaobject.h>
#include <QtCore/qsharedpointer.h>
#include <QtCore/qtimer.h>
Modified: trunk/Source/WebKit/qt/ChangeLog (107220 => 107221)
--- trunk/Source/WebKit/qt/ChangeLog 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-02-09 12:50:46 UTC (rev 107221)
@@ -1,3 +1,17 @@
+2012-02-09 Simon Hausmann <[email protected]>
+
+ [Qt] Fix compilation with newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=77653
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Api/qgraphicswebview.cpp: Removed unnecessary inclusion of removed header file.
+ * declarative/public.pri: Use quick1 instead of qtquick1. It's mandator with Qt 5.
+ * tests/tests.pri: Ditto.
+ * declarative/qdeclarativewebview_p.h: Fix includes, just use the module-less
+ version that works with all Qt versions.
+ * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Ditto.
+
2012-02-08 Leo Franchi <[email protected]>
Remote web inspector reentrancy fixes
Modified: trunk/Source/WebKit/qt/declarative/public.pri (107220 => 107221)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-02-09 12:50:46 UTC (rev 107221)
@@ -27,12 +27,8 @@
CONFIG += qtwebkit qtwebkit-private
QT += declarative
-haveQt(5): QT += widgets quick
+haveQt(5): QT += widgets quick quick1
-contains(QT_CONFIG, qtquick1): {
- QT += qtquick1
-}
-
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
CONFIG += rpath
Modified: trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h (107220 => 107221)
--- trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h 2012-02-09 12:50:46 UTC (rev 107221)
@@ -21,17 +21,10 @@
#ifndef qdeclarativewebview_p_h
#define qdeclarativewebview_p_h
+#include <QAction>
+#include <QDeclarativeItem>
#include <QtCore/QBasicTimer>
#include <QtCore/QUrl>
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtQuick1/QDeclarativeItem>
-#include <QtWidgets/QAction>
-#else
-#include <QtDeclarative/QDeclarativeItem>
-#include <QtGui/QAction>
-#endif
-
#include <QtNetwork/QNetworkAccessManager>
#include "qgraphicswebview.h"
#include "qwebpage.h"
Modified: trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (107220 => 107221)
--- trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2012-02-09 12:50:46 UTC (rev 107221)
@@ -2,13 +2,8 @@
#include <QAction>
#include <QColor>
#include <QDebug>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtQuick1/QDeclarativeItem>
-#include <QtQuick1/QDeclarativeView>
-#else
#include <QDeclarativeItem>
#include <QDeclarativeView>
-#endif
#include <QDeclarativeComponent>
#include <QDeclarativeEngine>
#include <QDeclarativeProperty>
Modified: trunk/Source/WebKit/qt/tests/tests.pri (107220 => 107221)
--- trunk/Source/WebKit/qt/tests/tests.pri 2012-02-09 12:41:37 UTC (rev 107220)
+++ trunk/Source/WebKit/qt/tests/tests.pri 2012-02-09 12:50:46 UTC (rev 107221)
@@ -22,7 +22,7 @@
CONFIG += qtwebkit
haveQt(5) {
- contains(QT_CONFIG, qtquick1): QT += declarative qtquick1
+ QT += declarative quick1
} else {
contains(QT_CONFIG, declarative): QT += declarative
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
