1 files changed, 39 insertions, 32 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 8b6adc0176..a1392e10dc 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -310,7 +310,6 @@ QWidget *QApplication::topLevelAt(const QPoint &pos)
 */
 
 void qt_init_tooltip_palette();
-void qt_cleanup();
 
 QStyle *QApplicationPrivate::app_style = nullptr;        // default application style
 #ifndef QT_NO_STYLE_STYLESHEET
@@ -496,8 +495,11 @@ void QApplicationPrivate::init()
 void qt_init_tooltip_palette()
 {
 #if QT_CONFIG(tooltip)
-    if (const QPalette *toolTipPalette = QGuiApplicationPrivate::platformTheme()->palette(QPlatformTheme::ToolTipPalette))
-        QToolTip::setPalette(*toolTipPalette);
+    if (const QPalette *toolTipPalette = QGuiApplicationPrivate::platformTheme()->palette(QPlatformTheme::ToolTipPalette)) {
+        QPalette toolTipPal = *toolTipPalette;
+        toolTipPal.setResolveMask(0);
+        QToolTip::setPalette(toolTipPal);
+    }
 #endif
 }
 
@@ -705,7 +707,10 @@ QApplication::~QApplication()
 
     d->cleanupMultitouch();
 
-    qt_cleanup();
+    QPixmapCache::clear();
+    QColormap::cleanup();
+
+    QApplicationPrivate::active_window = nullptr; //### this should not be necessary
 
     if (QApplicationPrivate::widgetCount)
         qDebug("Widgets left: %i    Max widgets: %i \n", QWidgetPrivate::instanceCounter, QWidgetPrivate::maxInstances);
@@ -716,14 +721,6 @@ QApplication::~QApplication()
     QApplicationPrivate::widgetCount = false;
 }
 
-void qt_cleanup()
-{
-    QPixmapCache::clear();
-    QColormap::cleanup();
-
-    QApplicationPrivate::active_window = nullptr; //### this should not be necessary
-}
-
 /*!
     \fn QWidget *QApplication::widgetAt(const QPoint &point)
 
@@ -789,6 +786,7 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     const QEvent::Type type = event->type();
     switch (type) {
     case QEvent::UpdateRequest:
+    case QEvent::UpdateLater:
     case QEvent::LayoutRequest:
     case QEvent::Resize:
     case QEvent::Move:
@@ -817,6 +815,10 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
             static_cast<QMoveEvent *>(postedEvent.event)->m_pos =
                 static_cast<const QMoveEvent *>(event)->pos();
             break;
+        case QEvent::UpdateLater:
+            static_cast<QUpdateLaterEvent *>(postedEvent.event)->m_region +=
+                static_cast<const QUpdateLaterEvent *>(event)->region();
+            break;
         case QEvent::UpdateRequest:
         case QEvent::LanguageChange:
         case QEvent::LayoutRequest:
@@ -1092,6 +1094,12 @@ QPalette QApplicationPrivate::basePalette() const
     if (const QPalette *themePalette = platformTheme() ? platformTheme()->palette() : nullptr)
         palette = themePalette->resolve(palette);
 
+    // This palette now is Qt-generated, so reset the resolve mask. This allows
+    // QStyle::polish implementations to respect palettes that are user provided,
+    // by checking if the palette has a brush set for a color that the style might
+    // otherwise overwrite.
+    palette.setResolveMask(0);
+
     // Finish off by letting the application style polish the palette. This will
     // not result in the polished palette becoming a user-set palette, as the
     // resulting base palette is only used as a fallback, with the resolve mask
@@ -1774,7 +1782,7 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
 
 /*!
     \fn void QApplication::setActiveWindow(QWidget* active)
-    \deprecated Use QWidget::activateWindow() instead.
+    \deprecated [6.5] Use QWidget::activateWindow() instead.
 
     Sets the active window to the \a active widget in response to a system
     event. The function is called from the platform specific event handlers.
@@ -1967,7 +1975,7 @@ QWidget *QApplicationPrivate::focusNextPrevChild_helper(QWidget *toplevel, bool
         f = toplevel;
 
     QWidget *w = f;
-    QWidget *test = f->d_func()->focus_next;
+    QWidget *test = f->nextInFocusChain();
     bool seenWindow = false;
     bool focusWidgetAfterWindow = false;
     while (test && test != f) {
@@ -1998,7 +2006,7 @@ QWidget *QApplicationPrivate::focusNextPrevChild_helper(QWidget *toplevel, bool
             if (next)
                 break;
         }
-        test = test->d_func()->focus_next;
+        test = test->nextInFocusChain();
     }
 
     if (wrappingOccurred != nullptr)
@@ -2023,19 +2031,6 @@ QWidget *QApplicationPrivate::focusNextPrevChild_helper(QWidget *toplevel, bool
  */
 void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, const QPointF &globalPosF)
 {
-#if 0
-    if (leave) {
-        QEvent e(QEvent::Leave);
-        QCoreApplication::sendEvent(leave, & e);
-    }
-    if (enter) {
-        const QPoint windowPos = enter->window()->mapFromGlobal(globalPos);
-        QEnterEvent e(enter->mapFromGlobal(globalPos), windowPos, globalPos);
-        QCoreApplication::sendEvent(enter, & e);
-    }
-    return;
-#endif
-
     if ((!enter && !leave) || (enter == leave))
         return;
 
@@ -2546,8 +2541,9 @@ int QApplication::startDragDistance()
     exec(), because modal widgets call exec() to start a local event loop.
 
     To make your application perform idle processing, i.e., executing a special
-    function whenever there are no pending events, use a QTimer with 0 timeout.
-    More advanced idle processing schemes can be achieved using processEvents().
+    function whenever there are no pending events, use a QChronoTimer with 0ns
+    timeout. More advanced idle processing schemes can be achieved using
+    processEvents().
 
     We recommend that you connect clean-up code to the
     \l{QCoreApplication::}{aboutToQuit()} signal, instead of putting it in your
@@ -2656,6 +2652,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         Q_FALLTHROUGH();
     case QEvent::Leave:
         d->toolTipWakeUp.stop();
+        break;
     default:
         break;
     }
@@ -2680,6 +2677,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                     || key == Qt::Key_Up
                     || key == Qt::Key_Right
                     || key == Qt::Key_Down);
+        break;
     }
     default:
         break;
@@ -2941,6 +2939,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                                 tablet->tangentialPressure(), tablet->rotation(), tablet->z(),
                                 tablet->modifiers(), tablet->button(), tablet->buttons());
                 te.m_spont = e->spontaneous();
+                te.setTimestamp(tablet->timestamp());
                 te.setAccepted(false);
                 res = d->notify_helper(w, w == receiver ? tablet : &te);
                 eventAccepted = ((w == receiver) ? tablet : &te)->isAccepted();
@@ -3036,8 +3035,16 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
 #endif
                 w = qobject_cast<QWidget *>(QDragManager::self()->currentTarget());
 
-            if (!w)
-                break;
+            if (!w) {
+                // The widget that received DragEnter didn't accept the event, so we have no
+                // current drag target in the QDragManager. But DragLeave still needs to be
+                // dispatched so that enter/leave events are in balance (and so that UnderMouse
+                // gets cleared).
+                if (e->type() == QEvent::DragLeave)
+                    w = static_cast<QWidget *>(receiver);
+                else
+                    break;
+            }
             if (e->type() == QEvent::DragMove || e->type() == QEvent::Drop) {
                 QDropEvent *dragEvent = static_cast<QDropEvent *>(e);
                 QWidget *origReceiver = static_cast<QWidget *>(receiver);