10 files changed, 96 insertions, 77 deletions
diff --git a/src/corelib/itemmodels/qrangemodel_impl.h b/src/corelib/itemmodels/qrangemodel_impl.h
index f6b08099fe7..7eca3094a66 100644
--- a/src/corelib/itemmodels/qrangemodel_impl.h
+++ b/src/corelib/itemmodels/qrangemodel_impl.h
@@ -239,17 +239,15 @@ namespace QRangeModelDetails
         : std::true_type
     {};
 
-    // we use std::rotate in moveRows/Columns, which requires std::swap and the
-    // iterators to be at least a forward iterator
-    template <typename It, typename = void>
-    struct test_rotate : std::false_type {};
-
+    // we use std::rotate in moveRows/Columns, which requires the values (which
+    // might be const if we only get a const iterator) to be swappable, and the
+    // iterator type to be at least a forward iterator
     template <typename It>
-    struct test_rotate<It, std::void_t<decltype(std::swap(*std::declval<It>(),
-                                                          *std::declval<It>()))>>
-        : std::is_base_of<std::forward_iterator_tag,
-                          typename std::iterator_traits<It>::iterator_category>
-    {};
+    using test_rotate = std::conjunction<
+                            std::is_swappable<decltype(*std::declval<It>())>,
+                            std::is_base_of<std::forward_iterator_tag,
+                                            typename std::iterator_traits<It>::iterator_category>
+                        >;
 
     template <typename C, typename = void>
     struct test_splice : std::false_type {};
diff --git a/src/corelib/itemmodels/qrangemodeladapter.h b/src/corelib/itemmodels/qrangemodeladapter.h
index 2a23e01eba2..0234c402248 100644
--- a/src/corelib/itemmodels/qrangemodeladapter.h
+++ b/src/corelib/itemmodels/qrangemodeladapter.h
@@ -19,13 +19,11 @@ class QT_TECH_PREVIEW_API QRangeModelAdapter
 
 #ifdef Q_QDOC
     using range_type = Range;
-    using const_row_reference = typename std::iterator_traits<Range>::const_reference;
-    using row_reference = typename std::iterator_traits<Range>::reference;
 #else
     using range_type = QRangeModelDetails::wrapped_t<Range>;
+#endif
     using const_row_reference = typename Impl::const_row_reference;
     using row_reference = typename Impl::row_reference;
-#endif
     using range_features = typename QRangeModelDetails::range_traits<range_type>;
     using row_type = std::remove_reference_t<row_reference>;
     using row_features = QRangeModelDetails::range_traits<typename Impl::wrapped_row_type>;
@@ -78,16 +76,22 @@ class QT_TECH_PREVIEW_API QRangeModelAdapter
     template <typename C>
     using if_compatible_row_range = std::enable_if_t<is_compatible_row_range<C>, bool>;
     template <typename Data>
-    static constexpr bool is_compatible_data = true;
-        // std::is_convertible_v<Data, decltype(*std::begin(std::declval<const_row_reference>()))>;
+    static constexpr bool is_compatible_data = std::is_convertible_v<Data, data_type>;
     template <typename Data>
     using if_compatible_data = std::enable_if_t<is_compatible_data<Data>, bool>;
     template <typename C>
     static constexpr bool is_compatible_data_range = is_compatible_data<
+                                                typename QRangeModelDetails::data_type<
+                                                    typename QRangeModelDetails::row_traits<
                                                         decltype(*std::begin(std::declval<C&>()))
-                                                    >;
+                                                    >::item_type
+                                                >::type
+                                            >;
+    template <typename C>
+    using if_compatible_column_data = std::enable_if_t<is_compatible_data<C>
+                                                    || is_compatible_data_range<C>, bool>;
     template <typename C>
-    using if_compatible_data_range = std::enable_if_t<is_compatible_data_range<C>, bool>;
+    using if_compatible_column_range = std::enable_if_t<is_compatible_data_range<C>, bool>;
 
     template <typename R>
     using if_assignable_range = std::enable_if_t<std::is_assignable_v<range_type, R>, bool>;
@@ -1262,12 +1266,12 @@ public:
     decltype(auto) operator[](int row) const { return at(row); }
 
     template <typename I = Impl, if_table<I> = true, if_writable<I> = true>
-    decltype(auto) at(int row)
+    auto at(int row)
     {
         return RowReference{index(row, 0), this};
     }
     template <typename I = Impl, if_table<I> = true, if_writable<I> = true>
-    decltype(auto) operator[](int row) { return at(row); }
+    auto operator[](int row) { return at(row); }
 
     // at/operator[int, int] for table: returns value at row/column
     template <typename I = Impl, unless_list<I> = true>
@@ -1445,15 +1449,15 @@ public:
         return storage.m_model->insertColumn(before);
     }
 
-    template <typename D = row_type, typename I = Impl,
-              if_canInsertColumns<I> = true, if_compatible_data<D> = true>
+    template <typename D, typename I = Impl,
+              if_canInsertColumns<I> = true, if_compatible_column_data<D> = true>
     bool insertColumn(int before, D &&data)
     {
         return insertColumnImpl(before, storage.root(), std::forward<D>(data));
     }
 
     template <typename C, typename I = Impl,
-              if_canInsertColumns<I> = true, if_compatible_data_range<C> = true>
+              if_canInsertColumns<I> = true, if_compatible_column_range<C> = true>
     bool insertColumns(int before, C &&data)
     {
         return insertColumnsImpl(before, storage.root(), std::forward<C>(data));
diff --git a/src/corelib/itemmodels/qrangemodeladapter.qdoc b/src/corelib/itemmodels/qrangemodeladapter.qdoc
index ff595529d34..88872589299 100644
--- a/src/corelib/itemmodels/qrangemodeladapter.qdoc
+++ b/src/corelib/itemmodels/qrangemodeladapter.qdoc
@@ -277,14 +277,6 @@
 */
 
 /*!
-    \typedef QRangeModelAdapter::const_row_reference
-*/
-
-/*!
-    \typedef QRangeModelAdapter::row_reference
-*/
-
-/*!
     \typedef QRangeModelAdapter::range_type
 */
 
@@ -531,8 +523,8 @@
 */
 
 /*!
-    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::unless_list<I>> QRangeModelAdapter<Range, Protocol, Model>::const_row_reference QRangeModelAdapter<Range, Protocol, Model>::at(int row) const
-    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::unless_list<I>> QRangeModelAdapter<Range, Protocol, Model>::const_row_reference QRangeModelAdapter<Range, Protocol, Model>::operator[](int row) const
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::unless_list<I>> decltype(auto) QRangeModelAdapter<Range, Protocol, Model>::at(int row) const
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::unless_list<I>> decltype(auto) QRangeModelAdapter<Range, Protocol, Model>::operator[](int row) const
 
     \return a constant reference to the row at \a row, as stored in \c Range.
 
@@ -540,8 +532,8 @@
 */
 
 /*!
-    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_table<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> QRangeModelAdapter<Range, Protocol, Model>::row_reference QRangeModelAdapter<Range, Protocol, Model>::at(int row)
-    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_table<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> QRangeModelAdapter<Range, Protocol, Model>::row_reference QRangeModelAdapter<Range, Protocol, Model>::operator[](int row)
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_table<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> auto QRangeModelAdapter<Range, Protocol, Model>::at(int row)
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_table<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> auto QRangeModelAdapter<Range, Protocol, Model>::operator[](int row)
 
     \return a mutable reference to the row at \a row, as stored in \c Range.
 
@@ -597,6 +589,16 @@
 */
 
 /*!
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_tree<I>> decltype(auto) QRangeModelAdapter<Range, Protocol, Model>::at(QSpan<const int> path) const
+    \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_tree<I>> decltype(auto) QRangeModelAdapter<Range, Protocol, Model>::operator[](QSpan<const int> path) const
+
+    \return a constant reference to the row specified by \a path, as stored in
+    \c Range.
+
+    \constraints \c Range is a tree.
+*/
+
+/*!
     \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_tree<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> auto QRangeModelAdapter<Range, Protocol, Model>::at(QSpan<const int> path)
     \fn template <typename Range, typename Protocol, typename Model> template <typename I, QRangeModelAdapter<Range, Protocol, Model>::if_tree<I>, QRangeModelAdapter<Range, Protocol, Model>::if_writable<I>> auto QRangeModelAdapter<Range, Protocol, Model>::operator[](QSpan<const int> path)
 
@@ -833,7 +835,7 @@
 */
 
 /*!
-    \fn template <typename Range, typename Protocol, typename Model> template <typename D, typename I, QRangeModelAdapter<Range, Protocol, Model>::if_canInsertColumns<I>, QRangeModelAdapter<Range, Protocol, Model>::if_compatible_data<D>> bool QRangeModelAdapter<Range, Protocol, Model>::insertColumn(int before, D &&data)
+    \fn template <typename Range, typename Protocol, typename Model> template <typename D, typename I, QRangeModelAdapter<Range, Protocol, Model>::if_canInsertColumns<I>, QRangeModelAdapter<Range, Protocol, Model>::if_compatible_column_data<D>> bool QRangeModelAdapter<Range, Protocol, Model>::insertColumn(int before, D &&data)
     \overload
 
     Inserts a single column constructed from \a data before the column specified
@@ -861,7 +863,7 @@
 */
 
 /*!
-    \fn template <typename Range, typename Protocol, typename Model> template <typename C, typename I, QRangeModelAdapter<Range, Protocol, Model>::if_canInsertColumns<I>, QRangeModelAdapter<Range, Protocol, Model>::if_compatible_data_range<C>> bool QRangeModelAdapter<Range, Protocol, Model>::insertColumns(int before, C &&data)
+    \fn template <typename Range, typename Protocol, typename Model> template <typename C, typename I, QRangeModelAdapter<Range, Protocol, Model>::if_canInsertColumns<I>, QRangeModelAdapter<Range, Protocol, Model>::if_compatible_column_range<C>> bool QRangeModelAdapter<Range, Protocol, Model>::insertColumns(int before, C &&data)
 
     Inserts columns constructed from the elements in \a data before the column
     specified by \a before into all rows, and returns whether the insertion was
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index 96e35dcb965..2a1af2315ca 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -234,14 +234,14 @@ QBasicReadWriteLock::contendedTryLockForRead(QDeadlineTimer timeout, void *dd)
             return d->recursiveLockForRead(timeout);
 
         auto lock = qt_unique_lock(d->mutex);
-        if (d != d_ptr.loadRelaxed()) {
+        if (QReadWriteLockPrivate *dd = d_ptr.loadAcquire(); d != dd) {
             // d_ptr has changed: this QReadWriteLock was unlocked before we had
             // time to lock d->mutex.
             // We are holding a lock to a mutex within a QReadWriteLockPrivate
             // that is already released (or even is already re-used). That's ok
             // because the QFreeList never frees them.
             // Just unlock d->mutex (at the end of the scope) and retry.
-            d = d_ptr.loadAcquire();
+            d = dd;
             continue;
         }
         return d->lockForRead(lock, timeout);
@@ -340,11 +340,11 @@ QBasicReadWriteLock::contendedTryLockForWrite(QDeadlineTimer timeout, void *dd)
             return d->recursiveLockForWrite(timeout);
 
         auto lock = qt_unique_lock(d->mutex);
-        if (d != d_ptr.loadRelaxed()) {
+        if (QReadWriteLockPrivate *dd = d_ptr.loadAcquire(); d != dd) {
             // The mutex was unlocked before we had time to lock the mutex.
             // We are holding to a mutex within a QReadWriteLockPrivate that is already released
             // (or even is already re-used) but that's ok because the QFreeList never frees them.
-            d = d_ptr.loadAcquire();
+            d = dd;
             continue;
         }
         return d->lockForWrite(lock, timeout);
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index de68a0042ac..ce35e8ccffe 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -332,8 +332,6 @@ struct TCBPoint
     qreal _c;
     qreal _b;
 
-    TCBPoint() {}
-    TCBPoint(QPointF point, qreal t, qreal c, qreal b) : _point(point), _t(t), _c(c), _b(b) {}
 
     bool operator==(const TCBPoint &other) const
     {
@@ -1381,7 +1379,7 @@ void QEasingCurve::addTCBSegment(const QPointF &nextPoint, qreal t, qreal c, qre
     if (!d_ptr->config)
         d_ptr->config = curveToFunctionObject(d_ptr->type);
 
-    d_ptr->config->_tcbPoints.append(TCBPoint(nextPoint, t, c, b));
+    d_ptr->config->_tcbPoints.append(TCBPoint{nextPoint, t, c, b});
 
     if (nextPoint == QPointF(1.0, 1.0)) {
         d_ptr->config->_bezierCurves = tcbToBezier(d_ptr->config->_tcbPoints);
diff --git a/src/tools/androidtestrunner/main.cpp b/src/tools/androidtestrunner/main.cpp
index b517d85c5fb..161d95db49c 100644
--- a/src/tools/androidtestrunner/main.cpp
+++ b/src/tools/androidtestrunner/main.cpp
@@ -28,7 +28,16 @@
 
 using namespace Qt::StringLiterals;
 
-#define EXIT_ERROR -1
+
+// QTest-based test processes may exit with up to 127 for normal test failures
+static constexpr int HIGHEST_QTEST_EXITCODE = 127;
+// Something went wrong in androidtestrunner, in general
+static constexpr int EXIT_ERROR = 254;
+// More specific exit codes for failures in androidtestrunner:
+static constexpr int EXIT_NOEXITCODE = 253; // Failed to transfer exit code from device
+static constexpr int EXIT_ANR        = 252; // Android ANR error (Application Not Responding)
+static constexpr int EXIT_NORESULTS  = 251; // Failed to transfer result files from device
+
 
 struct Options
 {
@@ -71,6 +80,13 @@ struct TestInfo
 
 static TestInfo g_testInfo;
 
+// QTest-based processes return 0 if all tests PASSed, or the number of FAILs up to 127.
+// Other exitcodes signify abnormal termination and are system-dependent.
+static bool isTestExitCodeNormal(const int ec)
+{
+    return (ec >= 0  &&  ec <= HIGHEST_QTEST_EXITCODE);
+}
+
 static bool execCommand(const QString &program, const QStringList &args,
                         QByteArray *output = nullptr, bool verbose = false)
 {
@@ -744,9 +760,9 @@ void printLogcatCrash(const QByteArray &logcat)
     }
 
     if (!crashLogcat.startsWith("********** Crash dump"))
-        qDebug() << "********** Crash dump: **********";
+        qDebug() << "[androidtestrunner] ********** BEGIN crash dump **********";
     qDebug().noquote() << crashLogcat.trimmed();
-    qDebug() << "********** End crash dump **********";
+    qDebug() << "[androidtestrunner] ********** END crash dump **********";
 }
 
 void analyseLogcat(const QString &timeStamp, int *exitCode)
@@ -781,10 +797,13 @@ void analyseLogcat(const QString &timeStamp, int *exitCode)
     // Check for ANRs
     const bool anrOccurred = logcat.contains("ANR in %1"_L1.arg(g_options.package).toUtf8());
     if (anrOccurred) {
-        // Treat a found ANR as a test failure.
-        *exitCode = *exitCode < 1 ? 1 : *exitCode;
-        qCritical("An ANR has occurred while running the test %s. The logcat will include "
-                  "additional logs from the system_server process.",
+        // Rather improbable, but if the test managed to return a non-crash exitcode then overwrite
+        // it to signify that something blew up. Same if we didn't manage to collect an exit code.
+        // Preserve all other exitcodes, they might be useful crash information from the device.
+        if (isTestExitCodeNormal(*exitCode) || *exitCode == EXIT_NOEXITCODE)
+            *exitCode = EXIT_ANR;
+        qCritical("[androidtestrunner] An ANR has occurred while running the test '%s';"
+                  " consult logcat for additional logs from the system_server process",
                   qPrintable(g_options.package));
     }
 
@@ -818,13 +837,14 @@ void analyseLogcat(const QString &timeStamp, int *exitCode)
         }
     }
 
-    // If we have a crash, attempt to print both logcat and the crash buffer which
-    // includes the crash stacktrace that is not included in the default logcat.
-    const bool testCrashed = *exitCode == EXIT_ERROR && !g_testInfo.isTestRunnerInterrupted.load();
+    // If we have an unpredictable exitcode, possibly a crash, attempt to print both logcat and the
+    // crash buffer which includes the crash stacktrace that is not included in the default logcat.
+    const bool testCrashed = (   !isTestExitCodeNormal(*exitCode)
+                              && !g_testInfo.isTestRunnerInterrupted.load());
     if (testCrashed) {
-        qDebug() << "********** logcat dump **********";
+        qDebug() << "[androidtestrunner] ********** BEGIN logcat dump **********";
         qDebug().noquote() << testLogcat.join(u'\n').trimmed();
-        qDebug() << "********** End logcat dump **********";
+        qDebug() << "[androidtestrunner] ********** END logcat dump **********";
 
         if (!crashLogcat.isEmpty())
             printLogcatCrash(crashLogcat);
@@ -839,7 +859,7 @@ static QString getCurrentTimeString()
     QStringList dateArgs = { "shell"_L1, "date"_L1, "+'%1'"_L1.arg(timeFormat) };
     QByteArray output;
     if (!execAdbCommand(dateArgs, &output, false)) {
-        qWarning() << "Date/time adb command failed";
+        qWarning() << "[androidtestrunner] ERROR in command: adb shell date";
         return {};
     }
 
@@ -851,14 +871,15 @@ static int testExitCode()
     QByteArray exitCodeOutput;
     const QString exitCodeCmd = "cat files/qtest_last_exit_code 2> /dev/null"_L1;
     if (!execAdbCommand({ "shell"_L1, runCommandAsUserArgs(exitCodeCmd) }, &exitCodeOutput, false)) {
-        qCritical() << "Failed to retrieve the test exit code.";
-        return EXIT_ERROR;
+        qCritical() << "[androidtestrunner] ERROR in command: adb shell cat files/qtest_last_exit_code";
+        return EXIT_NOEXITCODE;
     }
+    qDebug() << "[androidtestrunner] Test exitcode: " << exitCodeOutput;
 
     bool ok;
     int exitCode = exitCodeOutput.toInt(&ok);
 
-    return ok ? exitCode : EXIT_ERROR;
+    return ok ? exitCode : EXIT_NOEXITCODE;
 }
 
 static bool uninstallTestPackage()
@@ -899,7 +920,7 @@ void sigHandler(int signal)
     // a main event loop. Since, there's no other alternative to do this,
     // let's do the cleanup anyway.
     if (!g_testInfo.isPackageInstalled.load())
-        _exit(-1);
+        _exit(EXIT_ERROR);
     g_testInfo.isTestRunnerInterrupted.store(true);
 }
 
@@ -1031,7 +1052,9 @@ int main(int argc, char *argv[])
     if (g_options.showLogcatOutput)
         analyseLogcat(formattedStartTime, &exitCode);
 
-    exitCode = pullResults() ? exitCode : EXIT_ERROR;
+    const bool pullRes = pullResults();
+    if (!pullRes && isTestExitCodeNormal(exitCode))
+        exitCode = EXIT_NORESULTS;
 
     if (!uninstallTestPackage())
         return EXIT_ERROR;
diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake
index 27ea90b89ac..07e11dd935b 100644
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -37,7 +37,7 @@ qt_feature("qmake" PRIVATE
         QT_FEATURE_datestring AND QT_FEATURE_regularexpression AND QT_FEATURE_temporaryfile)
 
 qt_feature("qtwaylandscanner" PRIVATE
-    CONDITION TARGET Wayland::Scanner
+    CONDITION TARGET Wayland::Scanner AND NOT INTEGRITY AND NOT ANDROID AND NOT WASM AND NOT IOS AND NOT QNX AND NOT VXWORKS
 )
 
 qt_configure_add_summary_section(NAME "Core tools")
diff --git a/src/widgets/accessible/qaccessiblecolorwell.cpp b/src/widgets/accessible/qaccessiblecolorwell.cpp
index ca08e511e9a..64fcd2a7fd1 100644
--- a/src/widgets/accessible/qaccessiblecolorwell.cpp
+++ b/src/widgets/accessible/qaccessiblecolorwell.cpp
@@ -3,6 +3,8 @@
 
 #include "private/qaccessiblecolorwell_p.h"
 
+#include <QtCore/qcoreapplication.h>
+
 QT_REQUIRE_CONFIG(accessibility);
 
 #if QT_CONFIG(colordialog)
@@ -14,6 +16,7 @@ class QAccessibleColorWellItem : public QAccessibleInterface
 {
     QAccessibleColorWell *m_parent;
 
+    Q_DECLARE_TR_FUNCTIONS(QAccessibleColorWellItem)
 public:
     QAccessibleColorWellItem(QAccessibleColorWell *parent);
 
@@ -79,7 +82,7 @@ QString QAccessibleColorWellItem::text(QAccessible::Text t) const
     if (t == QAccessible::Name) {
         QRgb color = m_parent->colorWell()->rgbValues()[m_parent->indexOfChild(this)];
         //: Color specified via its 3 RGB components (red, green, blue)
-        return QObject::tr("RGB %1, %2, %3")
+        return tr("RGB %1, %2, %3")
                 .arg(QString::number(qRed(color)), QString::number(qGreen(color)),
                      QString::number(qBlue(color)));
     }
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 3417d93d587..97332cd7d5d 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -6,15 +6,12 @@
 
 #include <qapplication.h>
 #include <qevent.h>
-#include <qpointer.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qstylepainter.h>
 #if QT_CONFIG(effects)
 #include <private/qeffects_p.h>
 #endif
-#include <qtextdocument.h>
-#include <qdebug.h>
 #include <qpa/qplatformscreen.h>
 #include <qpa/qplatformcursor.h>
 #if QT_CONFIG(style_stylesheet)
@@ -23,12 +20,9 @@
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformwindow_p.h>
 
-#include <qlabel.h>
 #include <QtWidgets/private/qlabel_p.h>
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <qtooltip.h>
-
-#include <QtCore/qbasictimer.h>
 #include <QtWidgets/private/qtooltip_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -190,10 +184,10 @@ void QTipLabel::resizeEvent(QResizeEvent *e)
 void QTipLabel::mouseMoveEvent(QMouseEvent *e)
 {
     if (!rect.isNull()) {
-        QPoint pos = e->globalPosition().toPoint();
+        QPointF pos = e->globalPosition();
         if (widget)
             pos = widget->mapFromGlobal(pos);
-        if (!rect.contains(pos))
+        if (!rect.contains(pos.toPoint()))
             hideTip();
     }
     QLabel::mouseMoveEvent(e);
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 90c1cfb4b86..592b70ef8ba 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -1994,12 +1994,9 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
                 tr = proxy()->subElementRect(SE_TabBarTabText, opt, widget);
 
             if (!tab->icon.isNull()) {
-                QPixmap tabIcon = tab->icon.pixmap(tab->iconSize, QStyleHelper::getDpr(p),
-                                                   (tab->state & State_Enabled) ? QIcon::Normal
-                                                                                : QIcon::Disabled,
-                                                   (tab->state & State_Selected) ? QIcon::On
-                                                                                 : QIcon::Off);
-                p->drawPixmap(iconRect.x(), iconRect.y(), tabIcon);
+                const auto mode = (tab->state & State_Enabled) ? QIcon::Normal : QIcon::Disabled;
+                const auto state = (tab->state & State_Selected) ? QIcon::On : QIcon::Off;
+                tab->icon.paint(p, iconRect, Qt::AlignCenter, mode, state);
             }
 
             proxy()->drawItemText(p, tr, alignment, tab->palette, tab->state & State_Enabled, tab->text,