1 files changed, 31 insertions, 18 deletions

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index fe57ac3a7e..7be83c1837 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -88,7 +88,9 @@
 
 #include "qwidget_p.h"
 #include <QtGui/private/qwindow_p.h>
-#include "qaction_p.h"
+#if QT_CONFIG(action)
+#  include "QtGui/private/qaction_p.h"
+#endif
 #include "qlayout_p.h"
 #if QT_CONFIG(graphicsview)
 #include "QtWidgets/qgraphicsproxywidget.h"
@@ -192,7 +194,15 @@ QWidgetPrivate::QWidgetPrivate(int version)
         return;
     }
 
-    checkForIncompatibleLibraryVersion(version);
+#ifdef QT_BUILD_INTERNAL
+    // Don't check the version parameter in internal builds.
+    // This allows incompatible versions to be loaded, possibly for testing.
+    Q_UNUSED(version);
+#else
+    if (Q_UNLIKELY(version != QObjectPrivateVersion))
+        qFatal("Cannot mix incompatible Qt library (version 0x%x) with this library (version 0x%x)",
+                version, QObjectPrivateVersion);
+#endif
 
     isWidget = true;
     memset(high_attributes, 0, sizeof(high_attributes));
@@ -1102,6 +1112,17 @@ QWindow *QWidgetPrivate::windowHandle(WindowHandleMode mode) const
     return nullptr;
 }
 
+/*!
+    \internal
+
+    Used by clients outside of widgets to get a handle to the
+    closest QWindow without having to link to widgets.
+*/
+QWindow *QWidgetPrivate::_q_closestWindowHandle() const
+{
+    return windowHandle(QWidgetPrivate::WindowHandleMode::Closest);
+}
+
 QScreen *QWidgetPrivate::associatedScreen() const
 {
     if (auto window = windowHandle(WindowHandleMode::Closest))
@@ -1419,9 +1440,9 @@ QWidget::~QWidget()
 
 #ifndef QT_NO_ACTION
     // remove all actions from this widget
-    for (int i = 0; i < d->actions.size(); ++i) {
-        QActionPrivate *apriv = d->actions.at(i)->d_func();
-        apriv->widgets.removeAll(this);
+    for (auto action : qAsConst(d->actions)) {
+        QActionPrivate *apriv = action->d_func();
+        apriv->associatedObjects.removeAll(this);
     }
     d->actions.clear();
 #endif
@@ -1506,13 +1527,8 @@ QWidget::~QWidget()
 
     if (d->declarativeData) {
         d->wasDeleted = true; // needed, so that destroying the declarative data does the right thing
-        if (static_cast<QAbstractDeclarativeDataImpl*>(d->declarativeData)->ownedByQml1) {
-            if (QAbstractDeclarativeData::destroyed_qml1)
-                QAbstractDeclarativeData::destroyed_qml1(d->declarativeData, this);
-        } else {
-            if (QAbstractDeclarativeData::destroyed)
-                QAbstractDeclarativeData::destroyed(d->declarativeData, this);
-        }
+        if (QAbstractDeclarativeData::destroyed)
+            QAbstractDeclarativeData::destroyed(d->declarativeData, this);
         d->declarativeData = nullptr;                 // don't activate again in ~QObject
         d->wasDeleted = false;
     }
@@ -3127,7 +3143,7 @@ void QWidget::insertAction(QAction *before, QAction *action)
     d->actions.insert(pos, action);
 
     QActionPrivate *apriv = action->d_func();
-    apriv->widgets.append(this);
+    apriv->associatedObjects.append(this);
 
     QActionEvent e(QEvent::ActionAdded, action, before);
     QCoreApplication::sendEvent(this, &e);
@@ -3164,7 +3180,7 @@ void QWidget::removeAction(QAction *action)
     Q_D(QWidget);
 
     QActionPrivate *apriv = action->d_func();
-    apriv->widgets.removeAll(this);
+    apriv->associatedObjects.removeAll(this);
 
     if (d->actions.removeAll(action)) {
         QActionEvent e(QEvent::ActionRemoved, action);
@@ -4373,7 +4389,7 @@ void QWidget::setPalette(const QPalette &palette)
     widget's palette are implicitly imposed on this widget by the user). Note
     that this font does not take into account the palette set on \a w itself.
 */
-QPalette QWidgetPrivate::naturalWidgetPalette(uint inheritedMask) const
+QPalette QWidgetPrivate::naturalWidgetPalette(QPalette::ResolveMask inheritedMask) const
 {
     Q_Q(const QWidget);
 
@@ -4910,9 +4926,6 @@ void qt_qpa_set_cursor(QWidget *w, bool force)
 
     \note To obtain the contents of a QOpenGLWidget, use QOpenGLWidget::grabFramebuffer()
     instead.
-
-    \note To obtain the contents of a QGLWidget (deprecated), use
-    QGLWidget::grabFrameBuffer() or QGLWidget::renderPixmap() instead.
 */
 void QWidget::render(QPaintDevice *target, const QPoint &targetOffset,
                      const QRegion &sourceRegion, RenderFlags renderFlags)