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

Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/qtquickcontrols2.qdocconf
	src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/quicktemplates2/qquicktooltip.cpp
	src/quicktemplates2/qquicktooltip_p.h
	src/quicktemplates2/qquicktumbler.cpp
	tests/auto/controls/data/tst_spinbox.qml
	tests/auto/controls/data/tst_tumbler.qml
	tests/auto/qquickmaterialstyle/data/tst_material.qml

Change-Id: I25b7473b47739043b6f768603bece30b18021318

2 files changed, 85 insertions, 0 deletions

diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/focus/data/visualFocus.qml
new file mode 100644
index 00000000..0af87652
--- /dev/null
+++ b/tests/auto/focus/data/visualFocus.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.5
+import QtQuick.Controls 2.0
+
+Column {
+    width: 400
+    height: 400
+    Button {
+        text: "Button"
+        property bool showFocus: visualFocus
+    }
+    TextField {
+        text: "TextField"
+    }
+}
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp
index dec4fecd..409f2fc7 100644
--- a/tests/auto/focus/tst_focus.cpp
+++ b/tests/auto/focus/tst_focus.cpp
@@ -63,6 +63,8 @@ private slots:
 
     void reason_data();
     void reason();
+
+    void visualFocus();
 };
 
 void tst_focus::initTestCase()
@@ -245,6 +247,35 @@ void tst_focus::reason()
     QCOMPARE(control->property("visualFocus"), QVariant(true));
 }
 
+void tst_focus::visualFocus()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("visualFocus.qml"));
+    view.show();
+    view.requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(&view));
+
+    QQuickItem *column = view.rootObject();
+    QVERIFY(column);
+    QCOMPARE(column->childItems().count(), 2);
+
+    QQuickControl *button = qobject_cast<QQuickControl *>(column->childItems().first());
+    QVERIFY(button);
+
+    QQuickItem *textfield = column->childItems().last();
+    QVERIFY(textfield);
+
+    button->forceActiveFocus(Qt::TabFocusReason);
+    QVERIFY(button->hasActiveFocus());
+    QVERIFY(button->hasVisualFocus());
+    QVERIFY(button->property("showFocus").toBool());
+
+    QTest::mouseClick(&view, Qt::LeftButton, Qt::NoModifier, QPoint(textfield->x() + textfield->width() / 2, textfield->y() + textfield->height() / 2));
+    QVERIFY(!button->hasActiveFocus());
+    QVERIFY(!button->hasVisualFocus());
+    QVERIFY(!button->property("showFocus").toBool());
+}
+
 QTEST_MAIN(tst_focus)
 
 #include "tst_focus.moc"