Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	tests/auto/qml/qml.pro
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4

12 files changed, 205 insertions, 1 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index b61eca730f..66c19098ef 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -72,7 +72,10 @@ qtHaveModule(widgets) {
 
 SUBDIRS += $$PUBLICTESTS
 SUBDIRS += $$METATYPETESTS
-!winrt:!contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger # no QProcess on winrt
+!winrt { # no QProcess on winrt
+    !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
+    SUBDIRS += qmllint
+}
 
 contains(QT_CONFIG, private_tests) {
     SUBDIRS += $$PRIVATETESTS
diff --git a/tests/auto/qml/qmllint/data/QTBUG-45916.js b/tests/auto/qml/qmllint/data/QTBUG-45916.js
new file mode 100644
index 0000000000..1947b5aa80
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/QTBUG-45916.js
@@ -0,0 +1,6 @@
+.pragma library
+.import QtQuick 2.4 as JSQtQuick
+
+function foo(url)
+{
+}
diff --git a/tests/auto/qml/qmllint/data/Simple.qml b/tests/auto/qml/qmllint/data/Simple.qml
new file mode 100644
index 0000000000..db54cff477
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/Simple.qml
@@ -0,0 +1,4 @@
+import QtQuick 2.2
+
+Item {
+}
diff --git a/tests/auto/qml/qmllint/data/failure1.js b/tests/auto/qml/qmllint/data/failure1.js
new file mode 100644
index 0000000000..6a62accf06
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/failure1.js
@@ -0,0 +1,5 @@
+function foo()
+{
+    var hello
+    returm 0 // Typo
+}
diff --git a/tests/auto/qml/qmllint/data/failure1.qml b/tests/auto/qml/qmllint/data/failure1.qml
new file mode 100644
index 0000000000..56f0f746a9
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/failure1.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+Item {
+    id root # // Missing :
+}
diff --git a/tests/auto/qml/qmllint/data/importing_js.qml b/tests/auto/qml/qmllint/data/importing_js.qml
new file mode 100644
index 0000000000..fa6cf797db
--- /dev/null
+++ b/tests/auto/qml/qmllint/data/importing_js.qml
@@ -0,0 +1,5 @@
+import "QTBUG-45916.js" as JSTest
+
+Item {
+    id: root
+}
diff --git a/tests/auto/qml/qmllint/main.cpp b/tests/auto/qml/qmllint/main.cpp
new file mode 100644
index 0000000000..a6dadd7178
--- /dev/null
+++ b/tests/auto/qml/qmllint/main.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sergio Martins <sergio.martins@kdab.com>
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://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 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QProcess>
+#include <QString>
+
+class TestQmllint: public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void test();
+    void test_data();
+private:
+    QString m_qmllintPath;
+};
+
+void TestQmllint::initTestCase()
+{
+    m_qmllintPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmllint");
+#ifdef Q_OS_WIN
+    m_qmllintPath += QLatin1String(".exe");
+#endif
+    if (!QFileInfo(m_qmllintPath).exists()) {
+        QString message = QStringLiteral("qmllint executable not found (looked for %0)").arg(m_qmllintPath);
+        QFAIL(qPrintable(message));
+    }
+}
+
+void TestQmllint::test_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<bool>("isValid");
+
+    // Valid files:
+    QTest::newRow("Simple_QML") << QStringLiteral("Simple.qml") << true;
+    QTest::newRow("QML_importing_JS") << QStringLiteral("importing_js.qml") << true;
+    QTest::newRow("QTBUG-45916_JS_with_pragma_and_import") << QStringLiteral("QTBUG-45916.js") << true;
+
+    // Invalid files:
+    QTest::newRow("Invalid_syntax_QML") << QStringLiteral("failure1.qml") << false;
+    QTest::newRow("Invalid_syntax_JS") << QStringLiteral("failure1.js") << false;
+}
+
+void TestQmllint::test()
+{
+    QFETCH(QString, filename);
+    QFETCH(bool, isValid);
+    filename = QStringLiteral("data/") + filename;
+    QStringList args;
+    args << QStringLiteral("--silent") << filename;
+
+    bool success = QProcess::execute(m_qmllintPath, args) == 0;
+    QCOMPARE(success, isValid);
+}
+
+QTEST_MAIN(TestQmllint)
+#include "main.moc"
diff --git a/tests/auto/qml/qmllint/qmllint.pro b/tests/auto/qml/qmllint/qmllint.pro
new file mode 100644
index 0000000000..b53a6f6877
--- /dev/null
+++ b/tests/auto/qml/qmllint/qmllint.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+TARGET = testqmllint
+INCLUDEPATH += .
+
+SOURCES += main.cpp
+QT += testlib
diff --git a/tests/auto/qml/qmlmin/tst_qmlmin.cpp b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
index d2e8526896..6d2fba3f46 100644
--- a/tests/auto/qml/qmlmin/tst_qmlmin.cpp
+++ b/tests/auto/qml/qmlmin/tst_qmlmin.cpp
@@ -87,6 +87,7 @@ void tst_qmlmin::initTestCase()
     excludedDirs << "doc/src/snippets/qtquick1/qtbinding";
     excludedDirs << "doc/src/snippets/qtquick1/imports";
     excludedDirs << "tests/manual/v4";
+    excludedDirs << "tests/auto/qml/qmllint";
 
     // Add invalid files (i.e. files with syntax errors)
     invalidFiles << "tests/auto/quick/qquickloader/data/InvalidSourceComponent.qml";
diff --git a/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml b/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml
new file mode 100644
index 0000000000..dfac1549f9
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml
@@ -0,0 +1,37 @@
+import QtQuick 2.0
+
+Column {
+    width: 50; height: 200
+    Rectangle {
+        id: item1
+        objectName: "item1"
+        focus: true
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item2
+    }
+    Rectangle {
+        id: item2
+        objectName: "item2"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item3
+    }
+    Rectangle {
+        id: item3
+        objectName: "item3"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item4
+    }
+    Rectangle {
+        id: item4
+        objectName: "item4"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item3
+    }
+}
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index aa0b5b7693..a31f7ab9ce 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -87,6 +87,7 @@ private slots:
     void keyNavigation_skipNotVisible();
     void keyNavigation_implicitSetting();
     void keyNavigation_focusReason();
+    void keyNavigation_loop();
     void layoutMirroring();
     void layoutMirroringIllegalParent();
     void smooth();
@@ -2102,6 +2103,31 @@ void tst_QQuickItem::keyNavigation_focusReason()
     delete window;
 }
 
+void tst_QQuickItem::keyNavigation_loop()
+{
+    // QTBUG-47229
+    QQuickView *window = new QQuickView(0);
+    window->setBaseSize(QSize(240,320));
+
+    window->setSource(testFileUrl("keynavigationtest_loop.qml"));
+    window->show();
+    window->requestActivate();
+
+    QVERIFY(QTest::qWaitForWindowActive(window));
+    QCOMPARE(QGuiApplication::focusWindow(), window);
+
+    QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    QKeyEvent key = QKeyEvent(QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier, "", false, 1);
+    QGuiApplication::sendEvent(window, &key);
+    QVERIFY(key.isAccepted());
+    QVERIFY(item->hasActiveFocus());
+
+    delete window;
+}
+
 void tst_QQuickItem::smooth()
 {
     QQmlComponent component(&engine);
diff --git a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp
index 27a02377bd..302959dd7f 100644
--- a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp
+++ b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp
@@ -36,6 +36,7 @@
 #include <QtQuick/QQuickTextDocument>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/private/qquicktextedit_p.h>
+#include <QtQuick/private/qquicktext_p_p.h>
 #include <QtGui/QTextDocument>
 #include <QtGui/QTextDocumentWriter>
 #include <QtQml/QQmlEngine>
@@ -47,6 +48,7 @@ class tst_qquicktextdocument : public QQmlDataTest
     Q_OBJECT
 private slots:
     void textDocumentWriter();
+    void textDocumentWithImage();
 };
 
 QString text = QStringLiteral("foo bar");
@@ -74,6 +76,20 @@ void tst_qquicktextdocument::textDocumentWriter()
     delete o;
 }
 
+void tst_qquicktextdocument::textDocumentWithImage()
+{
+    QQuickTextDocumentWithImageResources document(0);
+    QImage image(1, 1, QImage::Format_Mono);
+    image.fill(1);
+
+    QString name = "image";
+    document.addResource(QTextDocument::ImageResource, name, image);
+    QTextImageFormat format;
+    format.setName(name);
+    QCOMPARE(image, document.image(format));
+    QCOMPARE(image, document.resource(QTextDocument::ImageResource, name).value<QImage>());
+}
+
 QTEST_MAIN(tst_qquicktextdocument)
 
 #include "tst_qquicktextdocument.moc"