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

Change-Id: Iaf83f4c74b25b08764005267713db91c95732fc0

7 files changed, 145 insertions, 5 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index cd55ae191d..7163fd8cff 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -2154,6 +2154,15 @@ void tst_QJSEngine::jsNumberClass()
         QJSValue ret = eng.evaluate("new Number(123).toPrecision()");
         QVERIFY(ret.isString());
         QCOMPARE(ret.toString(), QString::fromLatin1("123"));
+        ret = eng.evaluate("new Number(42).toPrecision(1)");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("4e+1"));
+        ret = eng.evaluate("new Number(42).toPrecision(2)");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("42"));
+        ret = eng.evaluate("new Number(42).toPrecision(3)");
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("42.0"));
     }
 }
 
diff --git a/tests/auto/qml/qqmlconsole/data/categorized_logging.qml b/tests/auto/qml/qqmlconsole/data/categorized_logging.qml
new file mode 100644
index 0000000000..d19b6ecc41
--- /dev/null
+++ b/tests/auto/qml/qqmlconsole/data/categorized_logging.qml
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.8
+
+Item {
+    id:root
+
+    LoggingCategory {
+        id: testCategory
+        name: "qt.test"
+    }
+
+    LoggingCategory {
+        id: emptyCategory
+    }
+
+    Component.onCompleted: {
+        console.debug(testCategory, "console.debug");
+        console.log(testCategory, "console.log");
+        console.info(testCategory, "console.info");
+        console.warn(testCategory, "console.warn");
+        console.error(testCategory, "console.error");
+
+        testCategory.name = "qt.test2";
+
+        console.error(emptyCategory, "console.error");
+    }
+}
diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
index f12656c5fe..f832143935 100644
--- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
+++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp
@@ -40,6 +40,7 @@ public:
 
 private slots:
     void logging();
+    void categorized_logging();
     void tracing();
     void profiling();
     void testAssert();
@@ -87,6 +88,41 @@ void tst_qqmlconsole::logging()
     delete object;
 }
 
+void tst_qqmlconsole::categorized_logging()
+{
+    QUrl testUrl = testFileUrl("categorized_logging.qml");
+    QQmlTestMessageHandler messageHandler;
+    messageHandler.setIncludeCategoriesEnabled(true);
+
+    QLoggingCategory testCategory("qt.test");
+    testCategory.setEnabled(QtDebugMsg, true);
+    QVERIFY(testCategory.isDebugEnabled());
+    QVERIFY(testCategory.isWarningEnabled());
+    QVERIFY(testCategory.isCriticalEnabled());
+
+    QQmlComponent component(&engine, testUrl);
+    QObject *object = component.create();
+    QVERIFY2(object != 0, component.errorString().toUtf8());
+
+    QVERIFY(messageHandler.messages().contains("qt.test: console.info"));
+    QVERIFY(messageHandler.messages().contains("qt.test: console.warn"));
+    QVERIFY(messageHandler.messages().contains("qt.test: console.error"));
+
+    QString emptyCategory = "default: " + QString::fromLatin1("%1:%2:%3: ").arg(testUrl.toString()).arg(50).arg(5) +
+                            "QML LoggingCategory: Declaring the name of the LoggingCategory is mandatory and cannot be changed later !";
+    QVERIFY(messageHandler.messages().contains(emptyCategory));
+
+    QString changedCategory = "default: " + QString::fromLatin1("%1:%2:%3: ").arg(testUrl.toString()).arg(45).arg(5) +
+                            "QML LoggingCategory: The name of a LoggingCategory cannot be changed after the Item is created";
+    QVERIFY(messageHandler.messages().contains(changedCategory));
+
+    QString useEmptyCategory = "default: " + QString::fromLatin1("%1:%2: ").arg(testUrl.toString()).arg(63) +
+                            "Error: A QmlLoggingCatgory was provided without a valid name";
+    QVERIFY(messageHandler.messages().contains(useEmptyCategory));
+
+    delete object;
+}
+
 void tst_qqmlconsole::tracing()
 {
     QUrl testUrl = testFileUrl("tracing.qml");
diff --git a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
index ab5e958323..124a107a37 100644
--- a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
+++ b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp
@@ -80,6 +80,10 @@ void tst_qqmlextensionplugin::iidCheck_data()
     QList<QString> files;
     for (QDirIterator it(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath), QDirIterator::Subdirectories); it.hasNext(); ) {
         QString file = it.next();
+#if defined(Q_OS_DARWIN)
+        if (file.contains(QLatin1String(".dSYM/")))
+            continue;
+#endif
         if (file.endsWith(SUFFIX)) {
             files << file;
         }
@@ -105,7 +109,7 @@ void tst_qqmlextensionplugin::iidCheck()
     QFETCH(QString, filePath);
 
     QPluginLoader loader(filePath);
-    QVERIFY(loader.load());
+    QVERIFY2(loader.load(), qPrintable(loader.errorString()));
     QVERIFY(loader.instance() != Q_NULLPTR);
 
     if (qobject_cast<QQmlExtensionPlugin *>(loader.instance())) {
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index 7baff93574..b69c6eedf8 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -125,6 +125,7 @@ private slots:
     void containsPress_data();
     void containsPress();
     void ignoreBySource();
+    void notPressedAfterStolenGrab();
 
 private:
     int startDragDistance() const {
@@ -1987,6 +1988,23 @@ void tst_QQuickMouseArea::ignoreBySource()
     QCOMPARE(flickable->contentY(), 0.);
 }
 
+void tst_QQuickMouseArea::notPressedAfterStolenGrab()
+{
+    QQuickWindow window;
+    window.resize(200, 200);
+    window.show();
+    QTest::qWaitForWindowExposed(&window);
+
+    QQuickMouseArea *ma = new QQuickMouseArea(window.contentItem());
+    ma->setSize(window.size());
+    QObject::connect(ma,
+                     static_cast<void (QQuickMouseArea::*)(QQuickMouseEvent*)>(&QQuickMouseArea::pressed),
+                     [&]() { window.contentItem()->grabMouse(); });
+
+    QTest::mouseClick(&window, Qt::LeftButton);
+    QVERIFY(!ma->pressed());
+}
+
 QTEST_MAIN(tst_QQuickMouseArea)
 
 #include "tst_qquickmousearea.moc"
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 55041eeb4d..96beb51612 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -101,11 +101,15 @@ Q_GLOBAL_STATIC(QMutex, qQmlTestMessageHandlerMutex)
 
 QQmlTestMessageHandler *QQmlTestMessageHandler::m_instance = 0;
 
-void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &, const QString &message)
+void QQmlTestMessageHandler::messageHandler(QtMsgType, const QMessageLogContext &context, const QString &message)
 {
     QMutexLocker locker(qQmlTestMessageHandlerMutex());
-    if (QQmlTestMessageHandler::m_instance)
-        QQmlTestMessageHandler::m_instance->m_messages.push_back(message);
+    if (QQmlTestMessageHandler::m_instance) {
+        if (QQmlTestMessageHandler::m_instance->m_includeCategories)
+            QQmlTestMessageHandler::m_instance->m_messages.push_back(QString("%1: %2").arg(context.category, message));
+        else
+            QQmlTestMessageHandler::m_instance->m_messages.push_back(message);
+    }
 }
 
 QQmlTestMessageHandler::QQmlTestMessageHandler()
@@ -114,6 +118,7 @@ QQmlTestMessageHandler::QQmlTestMessageHandler()
     Q_ASSERT(!QQmlTestMessageHandler::m_instance);
     QQmlTestMessageHandler::m_instance = this;
     m_oldHandler = qInstallMessageHandler(messageHandler);
+    m_includeCategories = false;
 }
 
 QQmlTestMessageHandler::~QQmlTestMessageHandler()
diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h
index 47a4aae231..33d7cbd1d0 100644
--- a/tests/auto/shared/util.h
+++ b/tests/auto/shared/util.h
@@ -87,12 +87,15 @@ public:
 
     void clear() { m_messages.clear(); }
 
+    void setIncludeCategoriesEnabled(bool enabled) { m_includeCategories = enabled; }
+
 private:
-    static void messageHandler(QtMsgType, const QMessageLogContext &, const QString &message);
+    static void messageHandler(QtMsgType, const QMessageLogContext &context, const QString &message);
 
     static QQmlTestMessageHandler *m_instance;
     QStringList m_messages;
     QtMessageHandler m_oldHandler;
+    bool m_includeCategories;
 };
 
 #endif // QQMLTESTUTILS_H