Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

9 files changed, 141 insertions, 30 deletions

diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
index 6129184738..8265d21350 100644
--- a/tests/auto/corelib/global/qflags/tst_qflags.cpp
+++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -121,7 +121,7 @@ void tst_QFlags::constExpr()
     QVERIFY(verifyConstExpr<uint(Qt::MouseButtons(Qt::RightButton) & 0xff)>(Qt::RightButton));
     QVERIFY(verifyConstExpr<uint(Qt::MouseButtons(Qt::RightButton) | 0xff)>(0xff));
 
-    QVERIFY(!verifyConstExpr<Qt::RightButton>(!Qt::MouseButtons(Qt::LeftButton)));
+    QVERIFY(!verifyConstExpr<Qt::RightButton>(~Qt::MouseButtons(Qt::LeftButton)));
 
 #if defined(__cpp_constexpr) &&  __cpp_constexpr-0 >= 201304
     QVERIFY(verifyConstExpr<uint(testRelaxedConstExpr())>(Qt::MiddleButton));
@@ -142,7 +142,6 @@ void tst_QFlags::signedness()
                      std::is_signed<Qt::Alignment::Int>::value));
 }
 
-#if defined(Q_COMPILER_CLASS_ENUM)
 enum class MyStrictEnum { StrictZero, StrictOne, StrictTwo, StrictFour=4 };
 Q_DECLARE_FLAGS( MyStrictFlags, MyStrictEnum )
 Q_DECLARE_OPERATORS_FOR_FLAGS( MyStrictFlags )
@@ -154,11 +153,9 @@ Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isComplex );
 Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isStatic );
 Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isLarge );
 Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isPointer );
-#endif
 
 void tst_QFlags::classEnum()
 {
-#if defined(Q_COMPILER_CLASS_ENUM)
     // The main aim of the test is making sure it compiles
     // The QCOMPARE are there as an extra
     MyStrictEnum e1 = MyStrictEnum::StrictOne;
@@ -257,7 +254,6 @@ void tst_QFlags::classEnum()
     // Just to make sure it compiles
     if (false)
         qDebug() << f3;
-#endif
 }
 
 void tst_QFlags::initializerLists()
@@ -268,12 +264,10 @@ void tst_QFlags::initializerLists()
     QVERIFY(bts.testFlag(Qt::RightButton));
     QVERIFY(!bts.testFlag(Qt::MiddleButton));
 
-#if defined(Q_COMPILER_CLASS_ENUM)
     MyStrictNoOpFlags flags = { MyStrictNoOpEnum::StrictOne, MyStrictNoOpEnum::StrictFour };
     QVERIFY(flags.testFlag(MyStrictNoOpEnum::StrictOne));
     QVERIFY(flags.testFlag(MyStrictNoOpEnum::StrictFour));
     QVERIFY(!flags.testFlag(MyStrictNoOpEnum::StrictTwo));
-#endif // Q_COMPILER_CLASS_ENUM
 
 #else
     QSKIP("This test requires C++11 initializer_list support.");
diff --git a/tests/auto/corelib/global/qglobal/qglobal.c b/tests/auto/corelib/global/qglobal/qglobal.c
index 0719c4b921..c7124454d0 100644
--- a/tests/auto/corelib/global/qglobal/qglobal.c
+++ b/tests/auto/corelib/global/qglobal/qglobal.c
@@ -85,7 +85,7 @@ int tst_QtVersion()
     return QT_VERSION;
 }
 
-const char *tst_qVersion() Q_DECL_NOTHROW
+const char *tst_qVersion() Q_DECL_NOEXCEPT
 {
 #if !defined(QT_NAMESPACE)
     return qVersion();
diff --git a/tests/auto/corelib/global/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro
index a40cb9a288..b105769430 100644
--- a/tests/auto/corelib/global/qglobal/qglobal.pro
+++ b/tests/auto/corelib/global/qglobal/qglobal.pro
@@ -2,3 +2,4 @@ CONFIG += testcase
 TARGET = tst_qglobal
 QT = core testlib
 SOURCES = tst_qglobal.cpp qglobal.c
+contains(QT_CONFIG, c++1z): CONFIG += c++1z
diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index 78b954f373..56da047147 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -126,6 +126,46 @@ void tst_QGlobal::for_each()
         QCOMPARE(i, counter++);
     }
     QCOMPARE(counter, list.count());
+
+    // Should also work with an existing variable
+    int local;
+    counter = 0;
+    foreach (local, list) {
+        QCOMPARE(local, counter++);
+    }
+    QCOMPARE(counter, list.count());
+    QCOMPARE(local, counter - 1);
+
+    // Test the macro does not mess if/else conditions
+    counter = 0;
+    if (true)
+        foreach (int i, list)
+            QCOMPARE(i, counter++);
+    else
+        QFAIL("If/Else mismatch");
+    QCOMPARE(counter, list.count());
+
+    counter = 0;
+    if (false)
+        foreach (int i, list)
+            if (i) QFAIL("If/Else mismatch");
+            else QFAIL("If/Else mismatch");
+    else
+        foreach (int i, list)
+            if (false) { }
+            else QCOMPARE(i, counter++);
+    QCOMPARE(counter, list.count());
+
+    // break and continue
+    counter = 0;
+    foreach (int i, list) {
+        if (i == 0)
+            continue;
+        QCOMPARE(i, (counter++) + 1);
+        if (i == 3)
+            break;
+    }
+    QCOMPARE(counter, 3);
 }
 
 void tst_QGlobal::qassert()
diff --git a/tests/auto/corelib/global/qlogging/BLACKLIST b/tests/auto/corelib/global/qlogging/BLACKLIST
index 1dcee92361..e474064f54 100644
--- a/tests/auto/corelib/global/qlogging/BLACKLIST
+++ b/tests/auto/corelib/global/qlogging/BLACKLIST
@@ -1,3 +1,7 @@
+[qMessagePattern:backtrace]
+# QTBUG-63915
+b2qt 64bit
+
 [qMessagePattern:backtrace depth,separator]
 # QTBUG-63915
 b2qt 64bit
diff --git a/tests/auto/corelib/global/qlogging/app/app.pro b/tests/auto/corelib/global/qlogging/app/app.pro
index b90b685749..3ada382ff4 100644
--- a/tests/auto/corelib/global/qlogging/app/app.pro
+++ b/tests/auto/corelib/global/qlogging/app/app.pro
@@ -14,8 +14,7 @@ QT = core
 
 DESTDIR = ./
 
-CONFIG -= app_bundle
-CONFIG += console
+CONFIG += cmdline
 
 SOURCES += main.cpp
 DEFINES += QT_MESSAGELOGCONTEXT
diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 9df54e17d3..d10d879130 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -254,19 +254,15 @@ public:
     int rvalue() && { ADD("TestClass1::rvalue"); return 0; }
     int const_rvalue() const && { ADD("TestClass1::const_rvalue"); return 0; }
 #endif
-#ifdef Q_COMPILER_DECLTYPE
     int decltype_param(int x = 0, decltype(x) = 0) { ADD("TestClass1::decltype_param"); return x; }
     template<typename T> int decltype_template_param(T x = 0, decltype(x) = 0)
     { ADD("TestClass1::decltype_template_param"); return x; }
     template<typename T> void decltype_template_param2(T x, decltype(x + QString()))
     { ADD("TestClass1::decltype_template_param2"); }
-#  ifdef Q_COMPILER_AUTO_FUNCTION
     auto decltype_return(int x = 0) -> decltype(x)
     { ADD("TestClass1::decltype_return"); return x; }
     template <typename T> auto decltype_template_return(T x = 0) -> decltype(x)
     { ADD("TestClass1::decltype_template_return"); return x; }
-#  endif
-#endif
 
 public:
     TestClass1()
@@ -323,15 +319,11 @@ public:
             std::move(*this).rvalue();
             std::move(*this).const_rvalue();
 #endif
-#ifdef Q_COMPILER_DECLTYPE
             decltype_param();
             decltype_template_param(0);
             decltype_template_param2(QByteArray(), QString());
-#  ifdef Q_COMPILER_AUTO_FUNCTION
             decltype_return();
             decltype_template_return(0);
-#  endif
-#endif
         }
 };
 
diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
index 03300c6dbe..0a84b1fdd8 100644
--- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
 ** Copyright (C) 2016 Intel Corporation.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -42,7 +42,8 @@ class tst_QNumeric: public QObject
 private slots:
     void fuzzyCompare_data();
     void fuzzyCompare();
-    void qNan();
+    void qNanInf();
+    void classifyfp();
     void floatDistance_data();
     void floatDistance();
     void floatDistance_double_data();
@@ -91,7 +92,7 @@ void tst_QNumeric::fuzzyCompare()
 #  pragma GCC optimize "no-fast-math"
 #endif
 
-void tst_QNumeric::qNan()
+void tst_QNumeric::qNanInf()
 {
 #if defined __FAST_MATH__ && (__GNUC__ * 100 + __GNUC_MINOR__ < 404)
     QSKIP("Non-conformant fast math mode is enabled, cannot run test");
@@ -99,9 +100,16 @@ void tst_QNumeric::qNan()
     double nan = qQNaN();
     QVERIFY(!(0 > nan));
     QVERIFY(!(0 < nan));
+    QVERIFY(!(0 == nan));
+    QVERIFY(!(nan == nan));
     QVERIFY(qIsNaN(nan));
     QVERIFY(qIsNaN(nan + 1));
     QVERIFY(qIsNaN(-nan));
+    QVERIFY(qIsNaN(1.0 / nan));
+    QVERIFY(qIsNaN(0.0 / nan));
+    QVERIFY(qIsNaN(0.0 * nan));
+    QCOMPARE(nan, nan);
+    QCOMPARE(nan, -nan);
 
     Q_STATIC_ASSERT(sizeof(double) == 8);
 #ifdef Q_LITTLE_ENDIAN
@@ -113,17 +121,56 @@ void tst_QNumeric::qNan()
     QVERIFY(!qIsFinite(nan));
     QVERIFY(!qIsInf(nan));
     QVERIFY(qIsNaN(nan));
+    QVERIFY(qIsNaN(-nan));
+    QVERIFY(!(nan == nan));
+    QVERIFY(qIsNaN(0.0 * nan));
+    QCOMPARE(qFpClassify(nan), FP_NAN);
+    QCOMPARE(nan, nan);
+    QCOMPARE(nan, -nan);
+    QCOMPARE(nan, qQNaN());
 
     double inf = qInf();
     QVERIFY(inf > 0);
     QVERIFY(-inf < 0);
     QVERIFY(qIsInf(inf));
+    QCOMPARE(inf, inf);
+    QCOMPARE(-inf, -inf);
     QVERIFY(qIsInf(-inf));
-    QVERIFY(qIsInf(2*inf));
-    QCOMPARE(1/inf, 0.0);
-    QVERIFY(qIsNaN(0*nan));
-    QVERIFY(qIsNaN(0*inf));
-    QVERIFY(qFuzzyCompare(1/inf, 0.0));
+    QVERIFY(qIsInf(inf + 1));
+    QVERIFY(qIsInf(inf - 1));
+    QVERIFY(qIsInf(inf * 2.0));
+    QVERIFY(qIsInf(inf / 2.0));
+    QVERIFY(qFuzzyCompare(1.0 / inf, 0.0));
+    QCOMPARE(1.0 / inf, 0.0);
+    QVERIFY(qIsNaN(0.0 * inf));
+}
+
+void tst_QNumeric::classifyfp()
+{
+    QCOMPARE(qFpClassify(qQNaN()), FP_NAN);
+
+    QCOMPARE(qFpClassify(qInf()), FP_INFINITE);
+    QCOMPARE(qFpClassify(-qInf()), FP_INFINITE);
+    QCOMPARE(qFpClassify(DBL_MAX * 2.0), FP_INFINITE);
+    QCOMPARE(qFpClassify(FLT_MAX * 2.f), FP_INFINITE);
+    QCOMPARE(qFpClassify(DBL_MAX * -2.0), FP_INFINITE);
+    QCOMPARE(qFpClassify(FLT_MAX * -2.f), FP_INFINITE);
+
+    QCOMPARE(qFpClassify(1.0), FP_NORMAL);
+    QCOMPARE(qFpClassify(DBL_MAX), FP_NORMAL);
+    QCOMPARE(qFpClassify(-DBL_MAX), FP_NORMAL);
+    QCOMPARE(qFpClassify(DBL_MIN), FP_NORMAL);
+    QCOMPARE(qFpClassify(-DBL_MIN), FP_NORMAL);
+    QCOMPARE(qFpClassify(DBL_MIN / 2.0), FP_SUBNORMAL);
+    QCOMPARE(qFpClassify(DBL_MIN / -2.0), FP_SUBNORMAL);
+
+    QCOMPARE(qFpClassify(1.f), FP_NORMAL);
+    QCOMPARE(qFpClassify(FLT_MAX), FP_NORMAL);
+    QCOMPARE(qFpClassify(-FLT_MAX), FP_NORMAL);
+    QCOMPARE(qFpClassify(FLT_MIN), FP_NORMAL);
+    QCOMPARE(qFpClassify(-FLT_MIN), FP_NORMAL);
+    QCOMPARE(qFpClassify(FLT_MIN / 2.f), FP_SUBNORMAL);
+    QCOMPARE(qFpClassify(FLT_MIN / -2.f), FP_SUBNORMAL);
 }
 
 void tst_QNumeric::floatDistance_data()
@@ -461,13 +508,13 @@ template <typename Int> static void mulOverflow_template()
     QCOMPARE(mul_overflow(Int(max / 2), Int(3), &r), true);
     QCOMPARE(mul_overflow(mid1, Int(mid2 + 1), &r), true);
     QCOMPARE(mul_overflow(Int(max / 2 + 2), Int(2), &r), true);
+    QCOMPARE(mul_overflow(Int(max - max / 2), Int(2), &r), true);
     QCOMPARE(mul_overflow(Int(1ULL << (std::numeric_limits<Int>::digits - 1)), Int(2), &r), true);
 
     if (min) {
         QCOMPARE(mul_overflow(min, Int(2), &r), true);
         QCOMPARE(mul_overflow(Int(min / 2), Int(3), &r), true);
         QCOMPARE(mul_overflow(Int(min / 2 - 1), Int(2), &r), true);
-        QCOMPARE(mul_overflow(Int(min + min/2), Int(2), &r), true);
     }
 #endif
 }
diff --git a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
index 7043969c2f..2345bb39c1 100644
--- a/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
+++ b/tests/auto/corelib/global/qtendian/tst_qtendian.cpp
@@ -64,6 +64,9 @@ struct TestData
     quint16 data16;
     quint8 data8;
 
+    float dataFloat;
+    double dataDouble;
+
     quint8 reserved;
 };
 
@@ -72,6 +75,7 @@ template <> quint8 getData(const TestData &d) { return d.data8; }
 template <> quint16 getData(const TestData &d) { return d.data16; }
 template <> quint32 getData(const TestData &d) { return d.data32; }
 template <> quint64 getData(const TestData &d) { return d.data64; }
+template <> float getData(const TestData &d) { return d.dataFloat; }
 
 union RawTestData
 {
@@ -79,9 +83,39 @@ union RawTestData
     TestData data;
 };
 
-static const TestData inNativeEndian = { Q_UINT64_C(0x0123456789abcdef), 0x00c0ffee, 0xcafe, 0xcf, '\0' };
-static const RawTestData inBigEndian = { "\x01\x23\x45\x67\x89\xab\xcd\xef" "\x00\xc0\xff\xee" "\xca\xfe" "\xcf" };
-static const RawTestData inLittleEndian = { "\xef\xcd\xab\x89\x67\x45\x23\x01" "\xee\xff\xc0\x00" "\xfe\xca" "\xcf" };
+template <typename Float>
+Float int2Float(typename QIntegerForSizeof<Float>::Unsigned i)
+{
+    Float result = 0;
+    memcpy(reinterpret_cast<char *>(&result), reinterpret_cast<const char *>(&i), sizeof (Float));
+    return result;
+}
+
+static const TestData inNativeEndian = {
+    Q_UINT64_C(0x0123456789abcdef),
+    0x00c0ffee,
+    0xcafe,
+    0xcf,
+    int2Float<float>(0x00c0ffeeU),
+    int2Float<double>(Q_UINT64_C(0x0123456789abcdef)),
+    '\0'
+};
+static const RawTestData inBigEndian = {
+    "\x01\x23\x45\x67\x89\xab\xcd\xef"
+    "\x00\xc0\xff\xee"
+    "\xca\xfe"
+    "\xcf"
+    "\x00\xc0\xff\xee"
+    "\x01\x23\x45\x67\x89\xab\xcd\xef"
+};
+static const RawTestData inLittleEndian = {
+    "\xef\xcd\xab\x89\x67\x45\x23\x01"
+    "\xee\xff\xc0\x00"
+    "\xfe\xca"
+    "\xcf"
+    "\xee\xff\xc0\x00"
+    "\xef\xcd\xab\x89\x67\x45\x23\x01"
+};
 
 #define EXPAND_ENDIAN_TEST(endian)          \
     do {                                    \