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

Change-Id: Ic6cfe08dbda1dc92b969e67063f805df63ba0fcf

4 files changed, 53 insertions, 26 deletions

diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index a34b957537..ad94ba9c77 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -138,16 +138,16 @@ static constexpr const auto KeyTbl = qMakeArray(
         Emkb2Qt< Qt::Key_Minus,         '-' >,
         Emkb2Qt< Qt::Key_Period,        '.' >,
         Emkb2Qt< Qt::Key_Slash,         '/' >,
-        Emkb2Qt< Qt::Key_0,             '0' >,
-        Emkb2Qt< Qt::Key_1,             '1' >,
-        Emkb2Qt< Qt::Key_2,             '2' >,
-        Emkb2Qt< Qt::Key_3,             '3' >,
-        Emkb2Qt< Qt::Key_4,             '4' >,
-        Emkb2Qt< Qt::Key_5,             '5' >,
-        Emkb2Qt< Qt::Key_6,             '6' >,
-        Emkb2Qt< Qt::Key_7,             '7' >,
-        Emkb2Qt< Qt::Key_8,             '8' >,
-        Emkb2Qt< Qt::Key_9,             '9' >,
+        Emkb2Qt< Qt::Key_0,             'D','i','g','i','t','0' >,
+        Emkb2Qt< Qt::Key_1,             'D','i','g','i','t','1' >,
+        Emkb2Qt< Qt::Key_2,             'D','i','g','i','t','2' >,
+        Emkb2Qt< Qt::Key_3,             'D','i','g','i','t','3' >,
+        Emkb2Qt< Qt::Key_4,             'D','i','g','i','t','4' >,
+        Emkb2Qt< Qt::Key_5,             'D','i','g','i','t','5' >,
+        Emkb2Qt< Qt::Key_6,             'D','i','g','i','t','6' >,
+        Emkb2Qt< Qt::Key_7,             'D','i','g','i','t','7' >,
+        Emkb2Qt< Qt::Key_8,             'D','i','g','i','t','8' >,
+        Emkb2Qt< Qt::Key_9,             'D','i','g','i','t','9' >,
         Emkb2Qt< Qt::Key_Semicolon,     ';' >,
         Emkb2Qt< Qt::Key_Equal,         '=' >,
         Emkb2Qt< Qt::Key_A,             'K','e','y','A' >,
@@ -432,7 +432,8 @@ Qt::Key QWasmEventTranslator::translateEmscriptKey(const EmscriptenKeyboardEvent
 {
     Qt::Key qtKey = Qt::Key_unknown;
 
-    if (qstrncmp(emscriptKey->code, "Key", 3) == 0 || qstrncmp(emscriptKey->code, "Numpad", 6) == 0) {
+    if (qstrncmp(emscriptKey->code, "Key", 3) == 0 || qstrncmp(emscriptKey->code, "Numpad", 6) == 0 ||
+        qstrncmp(emscriptKey->code, "Digit", 5) == 0) {
 
         emkb2qt_t searchKey{emscriptKey->code, 0}; // search emcsripten code
         auto it1 = std::lower_bound(KeyTbl.cbegin(), KeyTbl.cend(), searchKey);
@@ -862,11 +863,10 @@ Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBa
     case Qt::Key_Apostrophe:// linux
         wasmKey = find(circumflexKeyTable, accentBaseKey);
         break;
-        break;
     default:
         break;
-    };
 
+    };
     return wasmKey;
 }
 
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp
index 0d77889a36..86ab7651c6 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.cpp
+++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp
@@ -669,12 +669,6 @@ QDpi QWinRTScreen::logicalDpi() const
     return QDpi(d->logicalDpi, d->logicalDpi);
 }
 
-qreal QWinRTScreen::pixelDensity() const
-{
-    Q_D(const QWinRTScreen);
-    return qMax(1, qRound(d->logicalDpi / 96));
-}
-
 qreal QWinRTScreen::scaleFactor() const
 {
     Q_D(const QWinRTScreen);
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h
index 63c254940d..6b57780fa1 100644
--- a/src/plugins/platforms/winrt/qwinrtscreen.h
+++ b/src/plugins/platforms/winrt/qwinrtscreen.h
@@ -96,7 +96,6 @@ public:
     QImage::Format format() const override;
     QSizeF physicalSize() const override;
     QDpi logicalDpi() const override;
-    qreal pixelDensity() const override;
     qreal scaleFactor() const;
     QPlatformCursor *cursor() const override;
     Qt::KeyboardModifiers keyboardModifiers() const;
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm
index 85bf71be3f..258aba2cda 100644
--- a/src/plugins/styles/mac/qmacstyle_mac.mm
+++ b/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -75,6 +75,8 @@
 #include <QtWidgets/qwizard.h>
 #endif
 
+#include <cmath>
+
 QT_USE_NAMESPACE
 
 static QWindow *qt_getWindow(const QWidget *widget)
@@ -456,6 +458,37 @@ static bool setupSlider(NSSlider *slider, const QStyleOptionSlider *sl)
     return true;
 }
 
+static void fixStaleGeometry(NSSlider *slider)
+{
+    // If it's later fixed in AppKit, this function is not needed.
+    // On macOS Mojave we suddenly have NSSliderCell with a cached
+    // (and stale) geometry, thus its -drawKnob, -drawBarInside:flipped:,
+    // -drawTickMarks fail to render the slider properly. Setting the number
+    // of tickmarks triggers an update in geometry.
+
+    Q_ASSERT(slider);
+
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave)
+        return;
+
+    NSSliderCell *cell = slider.cell;
+    const NSRect barRect = [cell barRectFlipped:NO];
+    const NSSize sliderSize = slider.frame.size;
+    CGFloat difference = 0.;
+    if (slider.vertical)
+        difference = std::abs(sliderSize.height - barRect.size.height);
+    else
+        difference = std::abs(sliderSize.width - barRect.size.width);
+
+    if (difference > 6.) {
+        // Stale ...
+        const auto nOfTicks = slider.numberOfTickMarks;
+        // Non-zero, different from nOfTicks to force update
+        slider.numberOfTickMarks = nOfTicks + 10;
+        slider.numberOfTickMarks = nOfTicks;
+    }
+}
+
 static bool isInMacUnifiedToolbarArea(QWindow *window, int windowY)
 {
     QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
@@ -2083,10 +2116,9 @@ void QMacStyle::unpolish(QWidget* w)
 #if QT_CONFIG(menu)
         qobject_cast<QMenu*>(w) &&
 #endif
-        !w->testAttribute(Qt::WA_SetPalette)) {
-        QPalette pal = qApp->palette(w);
-        w->setPalette(pal);
-        w->setAttribute(Qt::WA_SetPalette, false);
+        !w->testAttribute(Qt::WA_SetPalette))
+    {
+        w->setPalette(QPalette());
         w->setWindowOpacity(1.0);
     }
 
@@ -2102,9 +2134,9 @@ void QMacStyle::unpolish(QWidget* w)
 #if QT_CONFIG(tabbar)
     if (qobject_cast<QTabBar*>(w)) {
         if (!w->testAttribute(Qt::WA_SetFont))
-            w->setFont(qApp->font(w));
+            w->setFont(QFont());
         if (!w->testAttribute(Qt::WA_SetPalette))
-            w->setPalette(qApp->palette(w));
+            w->setPalette(QPalette());
     }
 #endif
 
@@ -5276,6 +5308,8 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
 #endif
                 {
                     [slider calcSize];
+                    if (!hasDoubleTicks)
+                        fixStaleGeometry(slider);
                     NSSliderCell *cell = slider.cell;
 
                     const int numberOfTickMarks = slider.numberOfTickMarks;