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

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 97 insertions, 16 deletions

diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index 9855bec520..350ed24c28 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -40,6 +40,13 @@ struct MyStruct
     int i;
 };
 
+class MyGadget
+{
+    Q_GADGET
+public:
+    Q_INVOKABLE MyGadget() {}
+};
+
 namespace MyNamespace {
     // Used in tst_QMetaObject::checkScope
     class MyClass : public QObject
@@ -324,6 +331,7 @@ private slots:
     void signal();
     void signalIndex_data();
     void signalIndex();
+    void enumDebugStream_data();
     void enumDebugStream();
 
     void inherits_data();
@@ -1207,6 +1215,12 @@ void tst_QMetaObject::invokeMetaConstructor()
         QCOMPARE(obj2->parent(), (QObject*)&obj);
         QVERIFY(qobject_cast<NamespaceWithConstructibleClass::ConstructibleClass*>(obj2) != 0);
     }
+    // gadget shouldn't return a valid pointer
+    {
+        QCOMPARE(MyGadget::staticMetaObject.constructorCount(), 1);
+        QTest::ignoreMessage(QtWarningMsg, "QMetaObject::newInstance: type MyGadget does not inherit QObject");
+        QVERIFY(!MyGadget::staticMetaObject.newInstance());
+    }
 }
 
 void tst_QMetaObject::invokeTypedefTypes()
@@ -1741,37 +1755,104 @@ void tst_QMetaObject::signalIndex()
              SignalTestHelper::signalIndex(mm));
 }
 
+void tst_QMetaObject::enumDebugStream_data()
+{
+    QTest::addColumn<int>("verbosity");
+    QTest::addColumn<QString>("normalEnumMsg");
+    QTest::addColumn<QString>("scopedEnumMsg");
+    QTest::addColumn<QString>("globalEnumMsg");
+    QTest::addColumn<QString>("normalFlagMsg");
+    QTest::addColumn<QString>("normalFlagsMsg");
+    QTest::addColumn<QString>("scopedFlagMsg");
+    QTest::addColumn<QString>("scopedFlagsMsg");
+    QTest::addColumn<QString>("flagAsEnumMsg");
+
+    QTest::newRow("verbosity=0") << 0
+        << "hello MyEnum2 world"
+        << "hello MyScopedEnum::Enum3 scoped world"
+        << "WindowTitleHint Window Desktop WindowSystemMenuHint"
+        << "hello MyFlag1 world"
+        << "MyFlag1 MyFlag2|MyFlag3"
+        << "MyScopedFlag(MyFlag2)"
+        << "MyScopedFlag(MyFlag2|MyFlag3)"
+        << "MyFlag1";
+
+    QTest::newRow("verbosity=1") << 1
+        << "hello MyEnum::MyEnum2 world"
+        << "hello MyScopedEnum::Enum3 scoped world"
+        << "WindowType::WindowTitleHint WindowType::Window WindowType::Desktop WindowType::WindowSystemMenuHint"
+        << "hello MyFlag(MyFlag1) world"
+        << "MyFlag(MyFlag1) MyFlag(MyFlag2|MyFlag3)"
+        << "MyScopedFlag(MyFlag2)"
+        << "MyScopedFlag(MyFlag2|MyFlag3)"
+        << "MyFlag::MyFlag1";
+
+    QTest::newRow("verbosity=2") << 2
+        << "hello MyNamespace::MyClass::MyEnum2 world"
+        << "hello MyNamespace::MyClass::MyScopedEnum::Enum3 scoped world"
+        << "Qt::WindowTitleHint Qt::Window Qt::Desktop Qt::WindowSystemMenuHint"
+        << "hello QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) world"
+        << "QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) QFlags<MyNamespace::MyClass::MyFlag>(MyFlag2|MyFlag3)"
+        << "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2)"
+        << "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2|MyFlag3)"
+        << "MyNamespace::MyClass::MyFlag1";
+
+    QTest::newRow("verbosity=3") << 3
+        << "hello MyNamespace::MyClass::MyEnum::MyEnum2 world"
+        << "hello MyNamespace::MyClass::MyScopedEnum::Enum3 scoped world"
+        << "Qt::WindowType::WindowTitleHint Qt::WindowType::Window Qt::WindowType::Desktop Qt::WindowType::WindowSystemMenuHint"
+        << "hello QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) world"
+        << "QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) QFlags<MyNamespace::MyClass::MyFlag>(MyFlag2|MyFlag3)"
+        << "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2)"
+        << "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2|MyFlag3)"
+        << "MyNamespace::MyClass::MyFlag::MyFlag1";
+}
+
 void tst_QMetaObject::enumDebugStream()
 {
-    QTest::ignoreMessage(QtDebugMsg, "hello MyNamespace::MyClass::MyEnum2 world ");
-    qDebug() << "hello" << MyNamespace::MyClass::MyEnum2 << "world";
+    QFETCH(int, verbosity);
+
+    QFETCH(QString, normalEnumMsg);
+    QFETCH(QString, scopedEnumMsg);
+    QFETCH(QString, globalEnumMsg);
+
+    QFETCH(QString, normalFlagMsg);
+    QFETCH(QString, normalFlagsMsg);
+    QFETCH(QString, scopedFlagMsg);
+    QFETCH(QString, scopedFlagsMsg);
+    QFETCH(QString, flagAsEnumMsg);
+
+    // Enums
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(normalEnumMsg));
+    qDebug().verbosity(verbosity) << "hello" << MyNamespace::MyClass::MyEnum2 << "world";
 
-    QTest::ignoreMessage(QtDebugMsg, "hello MyNamespace::MyClass::MyScopedEnum::Enum3 scoped world ");
-    qDebug() << "hello" << MyNamespace::MyClass::MyScopedEnum::Enum3 << "scoped world";
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(scopedEnumMsg));
+    qDebug().verbosity(verbosity) << "hello" << MyNamespace::MyClass::MyScopedEnum::Enum3 << "scoped world";
 
-    QTest::ignoreMessage(QtDebugMsg, "Qt::WindowTitleHint Qt::Window Qt::Desktop Qt::WindowSystemMenuHint");
-    qDebug() << Qt::WindowTitleHint << Qt::Window << Qt::Desktop << Qt::WindowSystemMenuHint;
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(globalEnumMsg));
+    qDebug().verbosity(verbosity) << Qt::WindowTitleHint << Qt::Window << Qt::Desktop << Qt::WindowSystemMenuHint;
 
-    QTest::ignoreMessage(QtDebugMsg, "hello QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) world");
+    // Flags
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(normalFlagMsg));
     MyNamespace::MyClass::MyFlags f1 = MyNamespace::MyClass::MyFlag1;
-    qDebug() << "hello" << f1 << "world";
+    qDebug().verbosity(verbosity) << "hello" << f1 << "world";
 
     MyNamespace::MyClass::MyFlags f2 = MyNamespace::MyClass::MyFlag2 | MyNamespace::MyClass::MyFlag3;
-    QTest::ignoreMessage(QtDebugMsg, "QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) QFlags<MyNamespace::MyClass::MyFlag>(MyFlag2|MyFlag3)");
-    qDebug() << f1 << f2;
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(normalFlagsMsg));
+    qDebug().verbosity(verbosity) << f1 << f2;
 
-    QTest::ignoreMessage(QtDebugMsg, "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2)");
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(scopedFlagMsg));
     MyNamespace::MyClass::MyScopedFlags f3 = MyNamespace::MyClass::MyScopedFlag::MyFlag2;
-    qDebug() << f3;
+    qDebug().verbosity(verbosity) << f3;
 
-    QTest::ignoreMessage(QtDebugMsg, "QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2|MyFlag3)");
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(scopedFlagsMsg));
     f3 |= MyNamespace::MyClass::MyScopedFlag::MyFlag3;
-    qDebug() << f3;
+    qDebug().verbosity(verbosity) << f3;
 
     // Single flag recognized as enum:
-    QTest::ignoreMessage(QtDebugMsg, "MyNamespace::MyClass::MyFlag1");
+    QTest::ignoreMessage(QtDebugMsg, qPrintable(flagAsEnumMsg));
     MyNamespace::MyClass::MyFlag f4 = MyNamespace::MyClass::MyFlag1;
-    qDebug() << f4;
+    qDebug().verbosity(verbosity) << f4;
 }
 
 void tst_QMetaObject::inherits_data()