[Development] Qt 5.5.0 header diff: QtQuickWidgets.diff

[Frederik Gladhorn]

diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h
index 530a523..a8bf03e 100644
--- a/src/quickwidgets/qquickwidget.h
+++ b/src/quickwidgets/qquickwidget.h
@@ -90,6 +90,8 @@ public:
 
     void setClearColor(const QColor &color);
 
+    QQuickWindow *quickWindow() const;
+
 public Q_SLOTS:
     void setSource(const QUrl&);
     void setContent(const QUrl& url, QQmlComponent *component, QObject *item);
@@ -99,6 +101,7 @@ Q_SIGNALS:
     void sceneGraphError(QQuickWindow::SceneGraphError error, const QString &message);
 
 private Q_SLOTS:
+    // ### Qt 6: make these truly private slots through Q_PRIVATE_SLOT
     void continueExecute();
     void createFramebufferObject();
     void destroyFramebufferObject();
@@ -125,6 +128,13 @@ protected:
     virtual void wheelEvent(QWheelEvent *);
 #endif
 
+#ifndef QT_NO_DRAGANDDROP
+    virtual void dragEnterEvent(QDragEnterEvent *);
+    virtual void dragMoveEvent(QDragMoveEvent *);
+    virtual void dragLeaveEvent(QDragLeaveEvent *);
+    virtual void dropEvent(QDropEvent *);
+#endif
+
     bool event(QEvent *);
 
 private:
diff --git a/src/quickwidgets/qtquickwidgetsglobal.h b/src/quickwidgets/qtquickwidgetsglobal.h
index f0b1cae..60e5105 100644
--- a/src/quickwidgets/qtquickwidgetsglobal.h
+++ b/src/quickwidgets/qtquickwidgetsglobal.h

_______________________________________________
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development