Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/io/qsettings.cpp
	src/corelib/kernel/qvariant.cpp
	src/corelib/serialization/qjsoncbor.cpp
	src/corelib/serialization/qjsonvalue.cpp
	src/corelib/tools/tools.pri
	src/gui/image/qimage.cpp
	src/gui/kernel/qguivariant.cpp
	src/widgets/kernel/qshortcut.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json
	tests/auto/tools/moc/tst_moc.cpp
        src/opengl/qglframebufferobject.cpp

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Done-With: Leander Beernaert <leander.beernaert@qt.io>
Change-Id: Ie7f5fa646c607fe70c314bf7195f7578ded1d271

1 files changed, 38 insertions, 29 deletions

diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 127960b23c..cfa4782d78 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -723,38 +723,12 @@ void QToolButtonPrivate::_q_buttonReleased()
     popupTimer.stop();
 }
 
-void QToolButtonPrivate::popupTimerDone()
+static QPoint positionMenu(const QToolButton *q, bool horizontal,
+                           const QSize &sh)
 {
-    Q_Q(QToolButton);
-    popupTimer.stop();
-    if (!menuButtonDown && !down)
-        return;
-
-    menuButtonDown = true;
-    QPointer<QMenu> actualMenu;
-    bool mustDeleteActualMenu = false;
-    if(menuAction) {
-        actualMenu = menuAction->menu();
-    } else if (defaultAction && defaultAction->menu()) {
-        actualMenu = defaultAction->menu();
-    } else {
-        actualMenu = new QMenu(q);
-        mustDeleteActualMenu = true;
-        for(int i = 0; i < actions.size(); i++)
-            actualMenu->addAction(actions.at(i));
-    }
-    repeat = q->autoRepeat();
-    q->setAutoRepeat(false);
-    bool horizontal = true;
-#if QT_CONFIG(toolbar)
-    QToolBar *tb = qobject_cast<QToolBar*>(parent);
-    if (tb && tb->orientation() == Qt::Vertical)
-        horizontal = false;
-#endif
     QPoint p;
     const QRect rect = q->rect(); // Find screen via point in case of QGraphicsProxyWidget.
     QRect screen = QDesktopWidgetPrivate::availableGeometry(q->mapToGlobal(rect.center()));
-    QSize sh = ((QToolButton*)(QMenu*)actualMenu)->receivers(SIGNAL(aboutToShow()))? QSize() : actualMenu->sizeHint();
     if (horizontal) {
         if (q->isRightToLeft()) {
             if (q->mapToGlobal(QPoint(0, rect.bottom())).y() + sh.height() <= screen.bottom()) {
@@ -788,6 +762,37 @@ void QToolButtonPrivate::popupTimerDone()
     }
     p.rx() = qMax(screen.left(), qMin(p.x(), screen.right() - sh.width()));
     p.ry() += 1;
+    return p;
+}
+
+void QToolButtonPrivate::popupTimerDone()
+{
+    Q_Q(QToolButton);
+    popupTimer.stop();
+    if (!menuButtonDown && !down)
+        return;
+
+    menuButtonDown = true;
+    QPointer<QMenu> actualMenu;
+    bool mustDeleteActualMenu = false;
+    if (menuAction) {
+        actualMenu = menuAction->menu();
+    } else if (defaultAction && defaultAction->menu()) {
+        actualMenu = defaultAction->menu();
+    } else {
+        actualMenu = new QMenu(q);
+        mustDeleteActualMenu = true;
+        for (int i = 0; i < actions.size(); i++)
+            actualMenu->addAction(actions.at(i));
+    }
+    repeat = q->autoRepeat();
+    q->setAutoRepeat(false);
+    bool horizontal = true;
+#if QT_CONFIG(toolbar)
+    QToolBar *tb = qobject_cast<QToolBar*>(parent);
+    if (tb && tb->orientation() == Qt::Vertical)
+        horizontal = false;
+#endif
     QPointer<QToolButton> that = q;
     actualMenu->setNoReplayFor(q);
     if (!mustDeleteActualMenu) //only if action are not in this widget
@@ -796,7 +801,11 @@ void QToolButtonPrivate::popupTimerDone()
     actualMenu->d_func()->causedPopup.widget = q;
     actualMenu->d_func()->causedPopup.action = defaultAction;
     actionsCopy = q->actions(); //(the list of action may be modified in slots)
-    actualMenu->exec(p);
+
+    // QTBUG-78966, Delay positioning until after aboutToShow().
+    auto positionFunction = [q, horizontal](const QSize &sizeHint) {
+        return positionMenu(q, horizontal, sizeHint); };
+    actualMenu->d_func()->exec({}, nullptr, positionFunction);
 
     if (!that)
         return;