1 files changed, 95 insertions, 65 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 13897e1218..a1392e10dc 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -100,6 +100,13 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
+Q_TRACE_PREFIX(qtwidgets,
+   "#include <qcoreevent.h>"
+);
+Q_TRACE_METADATA(qtwidgets, "ENUM { AUTO, RANGE User ... MaxUser } QEvent::Type;");
+Q_TRACE_POINT(qtwidgets, QApplication_notify_entry, QObject *receiver, QEvent *event, QEvent::Type type);
+Q_TRACE_POINT(qtwidgets, QApplication_notify_exit, bool consumed, bool filtered);
+
 // Helper macro for static functions to check on the existence of the application class.
 #define CHECK_QAPP_INSTANCE(...) \
     if (Q_LIKELY(QCoreApplication::instance())) { \
@@ -303,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
@@ -489,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
 }
 
@@ -520,6 +529,8 @@ void QApplicationPrivate::initialize()
                 qWarning("QApplication: invalid style override '%s' passed, ignoring it.\n"
                     "\tAvailable styles: %s", qPrintable(styleOverride),
                     qPrintable(QStyleFactory::keys().join(", "_L1)));
+                // Clear styleOverride so it is not picked by Qt Quick Controls (QTBUG-100563)
+                styleOverride.clear();
             }
         }
 
@@ -696,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);
@@ -707,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)
 
@@ -776,35 +782,54 @@ QWidget *QApplication::widgetAt(const QPoint &p)
 */
 bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents)
 {
-    if ((event->type() == QEvent::UpdateRequest
-          || event->type() == QEvent::LayoutRequest
-          || event->type() == QEvent::Resize
-          || event->type() == QEvent::Move
-          || event->type() == QEvent::LanguageChange)) {
-        for (QPostEventList::const_iterator it = postedEvents->constBegin(); it != postedEvents->constEnd(); ++it) {
-            const QPostEvent &cur = *it;
-            if (cur.receiver != receiver || cur.event == nullptr || cur.event->type() != event->type())
-                continue;
-            if (cur.event->type() == QEvent::LayoutRequest
-                 || cur.event->type() == QEvent::UpdateRequest) {
-                ;
-            } else if (cur.event->type() == QEvent::Resize) {
-                static_cast<QResizeEvent *>(cur.event)->m_size =
-                    static_cast<const QResizeEvent *>(event)->size();
-            } else if (cur.event->type() == QEvent::Move) {
-                static_cast<QMoveEvent *>(cur.event)->m_pos =
-                    static_cast<const QMoveEvent *>(event)->pos();
-            } else if (cur.event->type() == QEvent::LanguageChange) {
-                ;
-            } else {
-                continue;
-            }
-            delete event;
-            return true;
+    // Only compress the following events:
+    const QEvent::Type type = event->type();
+    switch (type) {
+    case QEvent::UpdateRequest:
+    case QEvent::UpdateLater:
+    case QEvent::LayoutRequest:
+    case QEvent::Resize:
+    case QEvent::Move:
+    case QEvent::LanguageChange:
+        break;
+    default:
+        return QGuiApplication::compressEvent(event, receiver, postedEvents);
+    }
+
+    for (const auto &postedEvent : std::as_const(*postedEvents)) {
+
+        // Continue, unless a valid event of the same type exists for the same receiver
+        if (postedEvent.receiver != receiver
+            || !postedEvent.event
+            || postedEvent.event->type() != type) {
+            continue;
         }
-        return false;
+
+        // Handle type specific compression
+        switch (type) {
+        case QEvent::Resize:
+            static_cast<QResizeEvent *>(postedEvent.event)->m_size =
+                static_cast<const QResizeEvent *>(event)->size();
+            break;
+        case QEvent::Move:
+            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:
+            break;
+        default:
+            continue;
+        }
+        delete event;
+        return true;
     }
-    return QGuiApplication::compressEvent(event, receiver, postedEvents);
+    return false;
 }
 
 /*!
@@ -1069,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
@@ -1750,9 +1781,8 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
 }
 
 /*!
-    \internal
-
     \fn void QApplication::setActiveWindow(QWidget* active)
+    \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.
@@ -1769,7 +1799,7 @@ void QApplicationPrivate::notifyLayoutDirectionChange()
 
     \sa activeWindow(), QWidget::activateWindow()
 */
-#if QT_DEPRECATED_SINCE(6,4)
+#if QT_DEPRECATED_SINCE(6,5)
 void QApplication::setActiveWindow(QWidget* act)
 {
     QApplicationPrivate::setActiveWindow(act);
@@ -1945,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) {
@@ -1976,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)
@@ -2001,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;
 
@@ -2463,7 +2480,7 @@ void QApplication::setStartDragTime(int ms)
 
     The default value is 500 ms.
 
-    \sa startDragDistance(), {Drag and Drop}
+    \sa startDragDistance(), {Drag and Drop in Qt}{Drag and Drop}
 */
 
 int QApplication::startDragTime()
@@ -2502,7 +2519,7 @@ void QApplication::setStartDragDistance(int l)
     The default value (if the platform doesn't provide a different default)
     is 10 pixels.
 
-    \sa startDragTime(), QPoint::manhattanLength(), {Drag and Drop}
+    \sa startDragTime(), QPoint::manhattanLength(), {Drag and Drop in Qt}{Drag and Drop}
 */
 
 int QApplication::startDragDistance()
@@ -2524,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
@@ -2634,6 +2652,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         Q_FALLTHROUGH();
     case QEvent::Leave:
         d->toolTipWakeUp.stop();
+        break;
     default:
         break;
     }
@@ -2658,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;
@@ -2919,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();
@@ -3014,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);
@@ -3032,15 +3061,16 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                 )
                 QDragManager::self()->setCurrentTarget(nullptr, e->type() == QEvent::Drop);
             break;
-#endif
         }
+#endif // QT_CONFIG(draganddrop)
         case QEvent::TouchBegin: {
             // Note: TouchUpdate and TouchEnd events are never propagated
             QMutableTouchEvent *touchEvent = QMutableTouchEvent::from(static_cast<QTouchEvent *>(e));
             bool eventAccepted = touchEvent->isAccepted();
             bool acceptTouchEvents = w->testAttribute(Qt::WA_AcceptTouchEvents);
 
-            if (acceptTouchEvents && e->spontaneous()) {
+            if (acceptTouchEvents && e->spontaneous()
+             && touchEvent->device()->type() != QInputDevice::DeviceType::TouchPad) {
                 const QPoint localPos = touchEvent->points()[0].position().toPoint();
                 QApplicationPrivate::giveFocusAccordingToFocusPolicy(w, e, localPos);
             }