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

Change-Id: I9c2a18f5110adf3d8f630718238866aef47bb782

5 files changed, 49 insertions, 16 deletions

diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
index 00962afa72..ac20fb35ec 100644
--- a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
+++ b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
@@ -43,6 +43,7 @@ private slots:
     void keyValueAt();
     void keyValues();
     void duration();
+    void interpolation();
 };
 
 class TestableQVariantAnimation : public QVariantAnimation
@@ -129,6 +130,30 @@ void tst_QVariantAnimation::duration()
     QCOMPARE(anim.duration(), 500);
 }
 
+void tst_QVariantAnimation::interpolation()
+{
+    QVariantAnimation unsignedAnim;
+    unsignedAnim.setStartValue(100u);
+    unsignedAnim.setEndValue(0u);
+    unsignedAnim.setDuration(100);
+    unsignedAnim.setCurrentTime(50);
+    QCOMPARE(unsignedAnim.currentValue().toUInt(), 50u);
+
+    QVariantAnimation signedAnim;
+    signedAnim.setStartValue(100);
+    signedAnim.setEndValue(0);
+    signedAnim.setDuration(100);
+    signedAnim.setCurrentTime(50);
+    QCOMPARE(signedAnim.currentValue().toInt(), 50);
+
+    QVariantAnimation pointAnim;
+    pointAnim.setStartValue(QPoint(100, 100));
+    pointAnim.setEndValue(QPoint(0, 0));
+    pointAnim.setDuration(100);
+    pointAnim.setCurrentTime(50);
+    QCOMPARE(pointAnim.currentValue().toPoint(), QPoint(50, 50));
+}
+
 QTEST_MAIN(tst_QVariantAnimation)
 
 #include "tst_qvariantanimation.moc"
diff --git a/tests/auto/corelib/tools/qdatetime/BLACKLIST b/tests/auto/corelib/tools/qdatetime/BLACKLIST
new file mode 100644
index 0000000000..3a42ee066b
--- /dev/null
+++ b/tests/auto/corelib/tools/qdatetime/BLACKLIST
@@ -0,0 +1,2 @@
+[timeZoneAbbreviation]
+osx
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index c0b7674f22..d460beafde 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -2726,15 +2726,15 @@ void tst_QDateTime::timeZoneAbbreviation()
         qDebug("(Skipped some CET-only tests)");
     }
 
-    QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
 #ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
-    cet = QStringLiteral("GMT+01:00");
-    cest = QStringLiteral("GMT+02:00");
-#elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
-    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
-        cet = QStringLiteral("GMT+1");
-        cest = QStringLiteral("GMT+2");
-    }
+    const QString cet(QStringLiteral("GMT+01:00"));
+    const QString cest(QStringLiteral("GMT+02:00"));
+#elif defined Q_OS_DARWIN
+    const QString cet(QStringLiteral("GMT+1"));
+    const QString cest(QStringLiteral("GMT+2"));
+#else
+    const QString cet(QStringLiteral("CET"));
+    const QString cest(QStringLiteral("CEST"));
 #endif
 
     QDateTime dt5(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));
diff --git a/tests/auto/corelib/tools/qlocale/BLACKLIST b/tests/auto/corelib/tools/qlocale/BLACKLIST
new file mode 100644
index 0000000000..3eac7c10ed
--- /dev/null
+++ b/tests/auto/corelib/tools/qlocale/BLACKLIST
@@ -0,0 +1,2 @@
+[formatTimeZone]
+osx
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 9e9ba03a60..6132dabeea 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -1623,15 +1623,15 @@ void tst_QLocale::formatTimeZone()
         qDebug("(Skipped some CET-only tests)");
     }
 
-    QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
 #ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
-    cet = QStringLiteral("GMT+01:00");
-    cest = QStringLiteral("GMT+02:00");
-#elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
-    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
-        cet = QStringLiteral("GMT+1");
-        cest = QStringLiteral("GMT+2");
-    }
+    const QString cet(QStringLiteral("GMT+01:00"));
+    const QString cest(QStringLiteral("GMT+02:00"));
+#elif defined Q_OS_DARWIN
+    const QString cet(QStringLiteral("GMT+1"));
+    const QString cest(QStringLiteral("GMT+2"));
+#else
+    const QString cet(QStringLiteral("CET"));
+    const QString cest(QStringLiteral("CEST"));
 #endif
 
     QDateTime dt6(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));
@@ -2467,6 +2467,10 @@ void tst_QLocale::currency()
     QCOMPARE(de_DE.toCurrencyString(double(-1234.56), QLatin1String("BAZ")),
              QString::fromUtf8("-1.234,56\xc2\xa0" "BAZ"));
 
+    const QLocale es_CR(QLocale::Spanish, QLocale::CostaRica);
+    QCOMPARE(es_CR.toCurrencyString(double(1565.25)),
+             QString::fromUtf8("\xE2\x82\xA1" "1\xC2\xA0" "565,25"));
+
     const QLocale system = QLocale::system();
     QVERIFY(system.toCurrencyString(1, QLatin1String("FOO")).contains(QLatin1String("FOO")));
 }