Source/WebKit/qt/ChangeLog

 12012-05-23 Csaba Osztrogonác <ossy@webkit.org>
 2
 3 [Qt] Buildfix for newer Qt5
 4 https://bugs.webkit.org/show_bug.cgi?id=87257
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * Api/qgraphicswebview.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
 9 * Api/qwebframe.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
 10 * Api/qwebhistory.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
 11 * Api/qwebsettings.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
 12 * Api/qwebview.h: QtWidgets/qicon.h -> QtGui/qicon.h renaming.
 13 * WebCoreSupport/FrameLoaderClientQt.cpp: Adjust QCoreApplication::translate() parameter list to newer Qt 5.
 14 (WebCore::FrameLoaderClientQt::cancelledError):
 15 (WebCore::FrameLoaderClientQt::blockedError):
 16 (WebCore::FrameLoaderClientQt::cannotShowURLError):
 17 (WebCore::FrameLoaderClientQt::interruptedForPolicyChangeError):
 18 (WebCore::FrameLoaderClientQt::cannotShowMIMETypeError):
 19 (WebCore::FrameLoaderClientQt::fileDoesNotExistError):
 20 (WebCore::FrameLoaderClientQt::pluginWillHandleLoadError):
 21 * declarative/experimental/plugin.cpp: QDeclarativeExtensionPlugin -> QQmlExtensionPlugin renaming.
 22 * declarative/plugin.cpp: QDeclarativeExtensionPlugin -> QQmlExtensionPlugin renaming.
 23 (WebKitQmlPlugin):
 24
1252012-05-21 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
226
327 Move setEditingBehavior() from layoutTestController to window.internals

Source/WebKit/qt/Api/qgraphicswebview.h

2525#include <QtCore/qurl.h>
2626#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
2727#include <QtWidgets/qgraphicswidget.h>
28 #include <QtWidgets/qicon.h>
2928#else
3029#include <QtGui/qgraphicswidget.h>
31 #include <QtGui/qicon.h>
3230#endif
 31#include <QtGui/qicon.h>
3332#include <QtGui/qevent.h>
3433#include <QtGui/qpainter.h>
3534#include <QtNetwork/qnetworkaccessmanager.h>

Source/WebKit/qt/Api/qwebframe.h

2424#include <QtCore/qobject.h>
2525#include <QtCore/qurl.h>
2626#include <QtCore/qvariant.h>
27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
28 #include <QtWidgets/qicon.h>
29 #else
3027#include <QtGui/qicon.h>
31 #endif
3228#include <QtScript/qscriptengine.h>
3329#include <QtNetwork/qnetworkaccessmanager.h>
3430#include "qwebkitglobal.h"

Source/WebKit/qt/Api/qwebhistory.h

2424#include <QtCore/qstring.h>
2525#include <QtCore/qdatetime.h>
2626#include <QtCore/qshareddata.h>
27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
28 #include <QtWidgets/qicon.h>
29 #else
3027#include <QtGui/qicon.h>
31 #endif
3228
3329#include "qwebkitglobal.h"
3430

Source/WebKit/qt/Api/qwebsettings.h

2424
2525#include <QtCore/qstring.h>
2626#include <QtGui/qpixmap.h>
27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
28 #include <QtWidgets/qicon.h>
29 #else
3027#include <QtGui/qicon.h>
31 #endif
3228#include <QtCore/qshareddata.h>
3329
3430namespace WebCore {

Source/WebKit/qt/Api/qwebview.h

2525#include "qwebpage.h"
2626#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
2727#include <QtWidgets/qwidget.h>
28 #include <QtWidgets/qicon.h>
2928#else
3029#include <QtGui/qwidget.h>
31 #include <QtGui/qicon.h>
3230#endif
 31#include <QtGui/qicon.h>
3332#include <QtGui/qpainter.h>
3433#include <QtCore/qurl.h>
3534#include <QtNetwork/qnetworkaccessmanager.h>

Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@void FrameLoaderClientQt::committedLoad(WebCore::DocumentLoader* loader, const c
909909WebCore::ResourceError FrameLoaderClientQt::cancelledError(const WebCore::ResourceRequest& request)
910910{
911911 ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(),
912  QCoreApplication::translate("QWebFrame", "Request cancelled", 0, QCoreApplication::UnicodeUTF8));
 912 QCoreApplication::translate("QWebFrame", "Request cancelled", 0));
913913 error.setIsCancellation(true);
914914 return error;
915915}

@@enum {
929929WebCore::ResourceError FrameLoaderClientQt::blockedError(const WebCore::ResourceRequest& request)
930930{
931931 return ResourceError("WebKitErrorDomain", WebKitErrorCannotUseRestrictedPort, request.url().string(),
932  QCoreApplication::translate("QWebFrame", "Request blocked", 0, QCoreApplication::UnicodeUTF8));
 932 QCoreApplication::translate("QWebFrame", "Request blocked", 0));
933933}
934934
935935
936936WebCore::ResourceError FrameLoaderClientQt::cannotShowURLError(const WebCore::ResourceRequest& request)
937937{
938938 return ResourceError("WebKitErrorDomain", WebKitErrorCannotShowURL, request.url().string(),
939  QCoreApplication::translate("QWebFrame", "Cannot show URL", 0, QCoreApplication::UnicodeUTF8));
 939 QCoreApplication::translate("QWebFrame", "Cannot show URL", 0));
940940}
941941
942942WebCore::ResourceError FrameLoaderClientQt::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
943943{
944944 return ResourceError("WebKitErrorDomain", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(),
945  QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change", 0, QCoreApplication::UnicodeUTF8));
 945 QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change", 0));
946946}
947947
948948WebCore::ResourceError FrameLoaderClientQt::cannotShowMIMETypeError(const WebCore::ResourceResponse& response)
949949{
950950 return ResourceError("WebKitErrorDomain", WebKitErrorCannotShowMIMEType, response.url().string(),
951  QCoreApplication::translate("QWebFrame", "Cannot show mimetype", 0, QCoreApplication::UnicodeUTF8));
 951 QCoreApplication::translate("QWebFrame", "Cannot show mimetype", 0));
952952}
953953
954954WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore::ResourceResponse& response)
955955{
956956 return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(),
957  QCoreApplication::translate("QWebFrame", "File does not exist", 0, QCoreApplication::UnicodeUTF8));
 957 QCoreApplication::translate("QWebFrame", "File does not exist", 0));
958958}
959959
960960WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& response)
961961{
962962 return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(),
963  QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8));
 963 QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0));
964964}
965965
966966bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)

Source/WebKit/qt/declarative/experimental/plugin.cpp

@@public:
4343 QQuickWebViewExperimental* experimental() { return static_cast<QQuickWebView*>(parent())->experimental(); }
4444};
4545
46 class WebKitQmlExperimentalExtensionPlugin: public QDeclarativeExtensionPlugin {
 46class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin {
4747 Q_OBJECT
4848public:
4949 virtual void registerTypes(const char* uri)

Source/WebKit/qt/declarative/plugin.cpp

4444
4545QT_BEGIN_NAMESPACE
4646
 47#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
 48class WebKitQmlPlugin : public QQmlExtensionPlugin {
 49#else
4750class WebKitQmlPlugin : public QDeclarativeExtensionPlugin {
 51#endif
4852 Q_OBJECT
4953public:
5054#if defined(HAVE_WEBKIT2)

Tools/ChangeLog

 12012-05-23 Csaba Osztrogonác <ossy@webkit.org>
 2
 3 [Qt] Buildfix for newer Qt5
 4 https://bugs.webkit.org/show_bug.cgi?id=87257
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * MiniBrowser/qt/MiniBrowserApplication.h: QtDeclarative -> QtQml renaming.
 9
1102012-04-18 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
211
312 [Qt] Make the web view's url property follow the active url

Tools/MiniBrowser/qt/MiniBrowserApplication.h

3232#include <QHash>
3333#include <QObject>
3434#include <QStringList>
35 #include <QtDeclarative>
 35#include <QtQml>
3636#include <QGuiApplication>
3737#include <QTouchEvent>
3838#include <QUrl>