Fixed crash (probably miscompilation) with MinGW-w64 5.3.0

Change-Id: Iac1c5fe1879abfaa299ec909e5928912c2354126
qtwebkit · Feb 3, 2017 · 7952fc6 · 7952fc6
1 parent 660d3b8
commit 7952fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
@@ -116,16 +116,6 @@ QWebFrameAdapter* QWebFramePrivate::createChildFrame(QWebFrameData* frameData)
     return newFrame->d;
 }
 
-QWebFrame *QWebFramePrivate::apiHandle()
-{
-    return q;
-}
-
-QObject *QWebFramePrivate::handle()
-{
-    return q;
-}
-
 void QWebFramePrivate::contentsSizeDidChange(const QSize &size)
 {
     emit q->contentsSizeChanged(size);

diff --git a/Source/WebKit/qt/WidgetApi/qwebframe_p.h b/Source/WebKit/qt/WidgetApi/qwebframe_p.h
@@ -51,8 +51,8 @@ class QWebFramePrivate : public QWebFrameAdapter {
     static QWebFrame* kit(const QWebFrameAdapter*);
 
     // Adapter implementation
-    QWebFrame* apiHandle() override;
-    QObject* handle() override;
+    QWebFrame* apiHandle() override { return q; }
+    QObject* handle() override { return q; }
     void contentsSizeDidChange(const QSize &) override;
     int scrollBarPolicy(Qt::Orientation) const override;
     void emitUrlChanged() override;