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

Conflicts:
	.qmake.conf

Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692

2 files changed, 28 insertions, 4 deletions

diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index a2ab5a4a..cdea8b66 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -305,4 +305,25 @@ TestCase {
         compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset)
         control.destroy()
     }
+
+    function test_focus() {
+        var control = spinBox.createObject(testCase, {from: 10, to: 1000, value: 100, focus: true})
+        verify(control)
+
+        control.forceActiveFocus()
+        compare(control.activeFocus, true)
+
+        compare(control.from, 10)
+        compare(control.to, 1000)
+        compare(control.value, 100)
+
+        control.focus = false
+        compare(control.activeFocus, false)
+
+        compare(control.from, 10)
+        compare(control.to, 1000)
+        compare(control.value, 100)
+
+        control.destroy()
+    }
 }
diff --git a/tests/auto/pressandhold/tst_pressandhold.cpp b/tests/auto/pressandhold/tst_pressandhold.cpp
index 33d93cc0..8c4cf673 100644
--- a/tests/auto/pressandhold/tst_pressandhold.cpp
+++ b/tests/auto/pressandhold/tst_pressandhold.cpp
@@ -54,14 +54,17 @@ private slots:
 void tst_PressAndHold::pressAndHold_data()
 {
     QTest::addColumn<QByteArray>("data");
+    QTest::addColumn<QByteArray>("signal");
 
-    QTest::newRow("TextField") << QByteArray("import Qt.labs.controls 1.0; TextField { text: 'TextField' }");
-    QTest::newRow("TextArea") << QByteArray("import Qt.labs.controls 1.0; TextArea { text: 'TextArea' }");
+    QTest::newRow("Button") << QByteArray("import Qt.labs.controls 1.0; Button { text: 'Button' }") << QByteArray(SIGNAL(pressAndHold()));
+    QTest::newRow("TextField") << QByteArray("import Qt.labs.controls 1.0; TextField { text: 'TextField' }") << QByteArray(SIGNAL(pressAndHold(QQuickMouseEvent*)));
+    QTest::newRow("TextArea") << QByteArray("import Qt.labs.controls 1.0; TextArea { text: 'TextArea' }") << QByteArray(SIGNAL(pressAndHold(QQuickMouseEvent*)));
 }
 
 void tst_PressAndHold::pressAndHold()
 {
     QFETCH(QByteArray, data);
+    QFETCH(QByteArray, signal);
 
     QQmlEngine engine;
     QQmlComponent component(&engine);
@@ -71,8 +74,8 @@ void tst_PressAndHold::pressAndHold()
     QScopedPointer<QObject> waitControl(component.create());
     QVERIFY(!control.isNull() && !waitControl.isNull());
 
-    QSignalSpy spy(control.data(), SIGNAL(pressAndHold(QQuickMouseEvent*)));
-    QSignalSpy waitSpy(waitControl.data(), SIGNAL(pressAndHold(QQuickMouseEvent*)));
+    QSignalSpy spy(control.data(), signal);
+    QSignalSpy waitSpy(waitControl.data(), signal);
     QVERIFY(spy.isValid() && waitSpy.isValid());
 
     int startDragDistance = QGuiApplication::styleHints()->startDragDistance();