Diff
Modified: trunk/Source/WebCore/ChangeLog (120703 => 120704)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 11:34:43 UTC (rev 120704)
@@ -1,3 +1,17 @@
+2012-06-19 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5, use QPointer instead of the deprecated QWeakPointer.
+ https://bugs.webkit.org/show_bug.cgi?id=89449
+
+ Reviewed by Simon Hausmann.
+
+ * bridge/qt/qt_instance.h:
+ (QtInstance):
+ * bridge/qt/qt_runtime.h:
+ (QtField):
+ * platform/Widget.h:
+ (Widget):
+
2012-06-19 Taiju Tsuiki <[email protected]>
Web Inspector: FileSystem tree should hide uninitialized FileSystem
Modified: trunk/Source/WebCore/bridge/qt/qt_instance.h (120703 => 120704)
--- trunk/Source/WebCore/bridge/qt/qt_instance.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebCore/bridge/qt/qt_instance.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -21,8 +21,8 @@
#define qt_instance_h
#include "BridgeJSC.h"
+#include <QPointer>
#include <QStack>
-#include <QWeakPointer>
#include "Weak.h"
#include "runtime_root.h"
#include <qhash.h>
@@ -131,7 +131,7 @@
friend class QtField;
QtInstance(QObject*, PassRefPtr<RootObject>, ValueOwnership); // Factory produced only..
mutable QtClass* m_class;
- QWeakPointer<QObject> m_object;
+ QPointer<QObject> m_object;
QObject* m_hashkey;
mutable QHash<QByteArray, QtWeakObjectReference> m_methods;
mutable QHash<QString, QtField*> m_fields;
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.h (120703 => 120704)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -27,7 +27,7 @@
#include "qt_instance.h"
#include "runtime_method.h"
-#include <QWeakPointer>
+#include <QPointer>
#include <qbytearray.h>
#include <qmetaobject.h>
@@ -73,7 +73,7 @@
QtFieldType m_type;
QByteArray m_dynamicProperty;
QMetaProperty m_property;
- QWeakPointer<QObject> m_childObject;
+ QPointer<QObject> m_childObject;
};
Modified: trunk/Source/WebCore/platform/Widget.h (120703 => 120704)
--- trunk/Source/WebCore/platform/Widget.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebCore/platform/Widget.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -40,8 +40,8 @@
#endif
#if PLATFORM(QT)
+#include <QPointer>
#include <qglobal.h>
-#include <QWeakPointer>
#endif
#if PLATFORM(MAC)
@@ -276,7 +276,7 @@
#endif
#if PLATFORM(QT)
- QWeakPointer<QObject> m_bindingObject;
+ QPointer<QObject> m_bindingObject;
#endif
};
Modified: trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp (120703 => 120704)
--- trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-06-19 11:34:43 UTC (rev 120704)
@@ -476,7 +476,7 @@
if (!page)
return;
- page->d->view.clear();
+ page->d->view = 0;
page->d->client = nullptr;
// if the page was created by us, we own it and need to
Modified: trunk/Source/WebKit/qt/Api/qwebframe_p.h (120703 => 120704)
--- trunk/Source/WebKit/qt/Api/qwebframe_p.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/Api/qwebframe_p.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -151,7 +151,7 @@
QString linkText;
QUrl linkUrl;
QString linkTitle;
- QWeakPointer<QWebFrame> linkTargetFrame;
+ QPointer<QWebFrame> linkTargetFrame;
QWebElement linkElement;
QString alternateText;
QUrl imageUrl;
@@ -159,7 +159,7 @@
bool isContentEditable;
bool isContentSelected;
bool isScrollBar;
- QWeakPointer<QWebFrame> frame;
+ QPointer<QWebFrame> frame;
RefPtr<WebCore::Node> innerNode;
RefPtr<WebCore::Node> innerNonSharedNode;
};
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (120703 => 120704)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-06-19 11:34:43 UTC (rev 120704)
@@ -844,7 +844,7 @@
{
#ifndef QT_NO_CONTEXTMENU
QMenu* menu = d->currentContextMenu.data();
- d->currentContextMenu.clear();
+ d->currentContextMenu = 0;
return menu;
#else
return 0;
Modified: trunk/Source/WebKit/qt/Api/qwebpage_p.h (120703 => 120704)
--- trunk/Source/WebKit/qt/Api/qwebpage_p.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/Api/qwebpage_p.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -21,7 +21,7 @@
#ifndef QWEBPAGE_P_H
#define QWEBPAGE_P_H
-#include <QWeakPointer>
+#include <QPointer>
#include <qbasictimer.h>
#include <qnetworkproxy.h>
@@ -165,13 +165,13 @@
QWebPage *q;
WebCore::Page *page;
OwnPtr<QWebPageClient> client;
- QWeakPointer<QWebFrame> mainFrame;
+ QPointer<QWebFrame> mainFrame;
#ifndef QT_NO_UNDOSTACK
QUndoStack *undoStack;
#endif
- QWeakPointer<QWidget> view;
+ QPointer<QWidget> view;
bool insideOpenCall;
quint64 m_totalBytes;
@@ -196,7 +196,7 @@
QWebHistory history;
QWebHitTestResult hitTestResult;
#ifndef QT_NO_CONTEXTMENU
- QWeakPointer<QMenu> currentContextMenu;
+ QPointer<QMenu> currentContextMenu;
#endif
QWebSettings *settings;
QPalette palette;
Modified: trunk/Source/WebKit/qt/Api/qwebview.cpp (120703 => 120704)
--- trunk/Source/WebKit/qt/Api/qwebview.cpp 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/Api/qwebview.cpp 2012-06-19 11:34:43 UTC (rev 120704)
@@ -196,7 +196,7 @@
if (!page)
return;
- page->d->view.clear();
+ page->d->view = 0;
// if the page client is the special client constructed for
// delegating the responsibilities to a QWidget, we need
Modified: trunk/Source/WebKit/qt/ChangeLog (120703 => 120704)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-19 11:34:43 UTC (rev 120704)
@@ -1,3 +1,19 @@
+2012-06-19 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5, use QPointer instead of the deprecated QWeakPointer.
+ https://bugs.webkit.org/show_bug.cgi?id=89449
+
+ Reviewed by Simon Hausmann.
+
+ * Api/qwebframe_p.h:
+ (QWebHitTestResultPrivate):
+ * Api/qwebpage_p.h:
+ (QWebPagePrivate):
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::createFrame):
+ * WebCoreSupport/PageClientQt.h:
+ (PageClientQGraphicsWidget):
+
2012-06-19 Albert Astals Cid <[email protected]>
[Qt] Document the versions enums where added
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (120703 => 120704)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2012-06-19 11:34:43 UTC (rev 120704)
@@ -1344,7 +1344,7 @@
frameData.marginWidth = marginWidth;
frameData.marginHeight = marginHeight;
- QWeakPointer<QWebFrame> webFrame = new QWebFrame(m_webFrame, &frameData);
+ QPointer<QWebFrame> webFrame = new QWebFrame(m_webFrame, &frameData);
// The creation of the frame may have run arbitrary _javascript_ that removed it from the page already.
if (!webFrame.data()->d->frame->page()) {
frameData.frame.release();
Modified: trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h (120703 => 120704)
--- trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit/qt/WebCoreSupport/PageClientQt.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -239,7 +239,7 @@
#if USE(TEXTURE_MAPPER)
OwnPtr<TextureMapperLayerClientQt> TextureMapperLayerClient;
#else
- QWeakPointer<QGraphicsObject> rootGraphicsLayer;
+ QPointer<QGraphicsObject> rootGraphicsLayer;
#endif
// we have to flush quite often, so we use a meta-method instead of QTimer::singleShot for putting the event in the queue
Timer<PageClientQGraphicsWidget> syncTimer;
Modified: trunk/Source/WebKit2/ChangeLog (120703 => 120704)
--- trunk/Source/WebKit2/ChangeLog 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-19 11:34:43 UTC (rev 120704)
@@ -1,3 +1,12 @@
+2012-06-19 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Buildfix for newer Qt5, use QPointer instead of the deprecated QWeakPointer.
+ https://bugs.webkit.org/show_bug.cgi?id=89449
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/qt/qquicknetworkreply_p.h:
+
2012-06-19 Mike West <[email protected]>
Introduce ENABLE_CSP_NEXT configuration flag.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h (120703 => 120704)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h 2012-06-19 10:44:49 UTC (rev 120703)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h 2012-06-19 11:34:43 UTC (rev 120704)
@@ -28,7 +28,7 @@
#include "qwebkitglobal.h"
#include <QNetworkAccessManager>
#include <QObject>
-#include <QWeakPointer>
+#include <QPointer>
#include <QtQml/qqmllist.h>
#include <QtQuick/qquickitem.h>
@@ -58,7 +58,7 @@
WTF::RefPtr<WebKit::QtRefCountedNetworkRequestData> m_networkRequestData;
WTF::RefPtr<WebKit::QtRefCountedNetworkReplyData> m_networkReplyData;
QVariant m_data;
- QWeakPointer<QQuickWebViewExperimental> m_webViewExperimental;
+ QPointer<QQuickWebViewExperimental> m_webViewExperimental;
};
QML_DECLARE_TYPE(QQuickNetworkReply)
