Diff
Modified: trunk/Source/WebKit/qt/Api/qgraphicswebview.h (118510 => 118511)
--- trunk/Source/WebKit/qt/Api/qgraphicswebview.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/Api/qgraphicswebview.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -25,12 +25,11 @@
#include <QtCore/qurl.h>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtWidgets/qgraphicswidget.h>
-#include <QtWidgets/qicon.h>
#else
#include <QtGui/qgraphicswidget.h>
-#include <QtGui/qicon.h>
#endif
#include <QtGui/qevent.h>
+#include <QtGui/qicon.h>
#include <QtGui/qpainter.h>
#include <QtNetwork/qnetworkaccessmanager.h>
Modified: trunk/Source/WebKit/qt/Api/qwebframe.h (118510 => 118511)
--- trunk/Source/WebKit/qt/Api/qwebframe.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/Api/qwebframe.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -24,11 +24,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
#include <QtGui/qicon.h>
-#endif
#include <QtScript/qscriptengine.h>
#include <QtNetwork/qnetworkaccessmanager.h>
#include "qwebkitglobal.h"
Modified: trunk/Source/WebKit/qt/Api/qwebhistory.h (118510 => 118511)
--- trunk/Source/WebKit/qt/Api/qwebhistory.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/Api/qwebhistory.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -24,11 +24,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qshareddata.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
#include <QtGui/qicon.h>
-#endif
#include "qwebkitglobal.h"
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.h (118510 => 118511)
--- trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -24,11 +24,7 @@
#include <QtCore/qstring.h>
#include <QtGui/qpixmap.h>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/qicon.h>
-#else
#include <QtGui/qicon.h>
-#endif
#include <QtCore/qshareddata.h>
namespace WebCore {
Modified: trunk/Source/WebKit/qt/Api/qwebview.h (118510 => 118511)
--- trunk/Source/WebKit/qt/Api/qwebview.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/Api/qwebview.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -25,11 +25,10 @@
#include "qwebpage.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <QtWidgets/qwidget.h>
-#include <QtWidgets/qicon.h>
#else
#include <QtGui/qwidget.h>
-#include <QtGui/qicon.h>
#endif
+#include <QtGui/qicon.h>
#include <QtGui/qpainter.h>
#include <QtCore/qurl.h>
#include <QtNetwork/qnetworkaccessmanager.h>
Modified: trunk/Source/WebKit/qt/ChangeLog (118510 => 118511)
--- trunk/Source/WebKit/qt/ChangeLog 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-05-25 10:34:47 UTC (rev 118511)
@@ -1,3 +1,27 @@
+2012-05-25 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=87257
+
+ Reviewed by Simon Hausmann.
+
+ * Api/qgraphicswebview.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
+ * Api/qwebframe.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
+ * Api/qwebhistory.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
+ * Api/qwebsettings.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
+ * Api/qwebview.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
+ * WebCoreSupport/FrameLoaderClientQt.cpp: Adjust QCoreApplication::translate() parameter list to newer Qt 5.
+ (WebCore::FrameLoaderClientQt::cancelledError):
+ (WebCore::FrameLoaderClientQt::blockedError):
+ (WebCore::FrameLoaderClientQt::cannotShowURLError):
+ (WebCore::FrameLoaderClientQt::interruptedForPolicyChangeError):
+ (WebCore::FrameLoaderClientQt::cannotShowMIMETypeError):
+ (WebCore::FrameLoaderClientQt::fileDoesNotExistError):
+ (WebCore::FrameLoaderClientQt::pluginWillHandleLoadError):
+ * declarative/experimental/plugin.cpp: QDeclarativeExtensionPlugin -> QQmlExtensionPlugin renaming.
+ * declarative/plugin.cpp: QDeclarativeExtensionPlugin -> QQmlExtensionPlugin renaming.
+ (WebKitQmlPlugin):
+
2012-05-24 Ryosuke Niwa <[email protected]>
There are too many poorly named functions to create a fragment from markup
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (118510 => 118511)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-05-25 10:34:47 UTC (rev 118511)
@@ -909,7 +909,7 @@
WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest& request)
{
ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(),
- QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Request cancelled", 0));
error.setIsCancellation(true);
return error;
}
@@ -929,38 +929,38 @@
WebCore::ResourceError FrameLoaderClientQt::blockedError(const WebCore::ResourceRequest& request)
{
return ResourceError("WebKitErrorDomain", WebKitErrorCannotUseRestrictedPort, request.url().string(),
- QCoreApplication::translate("QWebFrame", "Request blocked", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Request blocked", 0));
}
WebCore::ResourceError FrameLoaderClientQt::cannotShowURLError(const WebCore::ResourceRequest& request)
{
return ResourceError("WebKitErrorDomain", WebKitErrorCannotShowURL, request.url().string(),
- QCoreApplication::translate("QWebFrame", "Cannot show URL", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Cannot show URL", 0));
}
WebCore::ResourceError FrameLoaderClientQt::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
{
return ResourceError("WebKitErrorDomain", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(),
- QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change", 0));
}
WebCore::ResourceError FrameLoaderClientQt::cannotShowMIMETypeError(const WebCore::ResourceResponse& response)
{
return ResourceError("WebKitErrorDomain", WebKitErrorCannotShowMIMEType, response.url().string(),
- QCoreApplication::translate("QWebFrame", "Cannot show mimetype", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Cannot show mimetype", 0));
}
WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore::ResourceResponse& response)
{
return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(),
- QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "File does not exist", 0));
}
WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& response)
{
return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(),
- QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
+ QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0));
}
bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
Modified: trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp (118510 => 118511)
--- trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/declarative/experimental/plugin.cpp 2012-05-25 10:34:47 UTC (rev 118511)
@@ -43,7 +43,7 @@
QQuickWebViewExperimental* experimental() { return static_cast<QQuickWebView*>(parent())->experimental(); }
};
-class WebKitQmlExperimentalExtensionPlugin: public QDeclarativeExtensionPlugin {
+class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin {
Q_OBJECT
public:
virtual void registerTypes(const char* uri)
Modified: trunk/Source/WebKit/qt/declarative/plugin.cpp (118510 => 118511)
--- trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Source/WebKit/qt/declarative/plugin.cpp 2012-05-25 10:34:47 UTC (rev 118511)
@@ -44,7 +44,11 @@
QT_BEGIN_NAMESPACE
+#if QT_VERSION >= 0x050000
+class WebKitQmlPlugin : public QQmlExtensionPlugin {
+#else
class WebKitQmlPlugin : public QDeclarativeExtensionPlugin {
+#endif
Q_OBJECT
public:
#if defined(HAVE_WEBKIT2)
Modified: trunk/Tools/ChangeLog (118510 => 118511)
--- trunk/Tools/ChangeLog 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Tools/ChangeLog 2012-05-25 10:34:47 UTC (rev 118511)
@@ -1,5 +1,14 @@
2012-05-25 Csaba Osztrogonác <[email protected]>
+ [Qt] Buildfix for newer Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=87257
+
+ Reviewed by Simon Hausmann.
+
+ * MiniBrowser/qt/MiniBrowserApplication.h: QtDeclarative -> QtQml renaming.
+
+2012-05-25 Csaba Osztrogonác <[email protected]>
+
[Qt] Unreviewed fix after r118484.
Enable CSS_EXCLUSIONS and CSS_REGIONS.
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (118510 => 118511)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-05-25 10:23:29 UTC (rev 118510)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-05-25 10:34:47 UTC (rev 118511)
@@ -32,7 +32,7 @@
#include <QHash>
#include <QObject>
#include <QStringList>
-#include <QtDeclarative>
+#include <QtQml>
#include <QGuiApplication>
#include <QTouchEvent>
#include <QUrl>
