4 files changed, 116 insertions, 2 deletions
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h
new file mode 100644
index 00000000..d1fe08f6
--- /dev/null
+++ b/tests/auto/shared/qtest_quickcontrols.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 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:LGPL3$
+** 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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 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.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 later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTEST_QUICKCONTROLS_H
+#define QTEST_QUICKCONTROLS_H
+
+#include <QtTest/qtest.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtGui/qguiapplication.h>
+#include <QtQml/qqml.h>
+#include <QtQuickControls2/qquickstyle.h>
+
+static QStringList testStyles()
+{
+    if (QQuickStyle::name().isEmpty())
+        return QQuickStyle::availableStyles();
+    return QStringList(QQuickStyle::name());
+}
+
+static int runTests(QObject *testObject, int argc, char *argv[])
+{
+    int res = 0;
+    QTest::qInit(testObject, argc, argv);
+    const QByteArray testObjectName = QTestResult::currentTestObjectName();
+    const QStringList styles = testStyles();
+    for (const QString &style : styles) {
+        qmlClearTypeRegistrations();
+        QQuickStyle::setStyle(style);
+        const QByteArray testName = testObjectName + "::" + style.toLocal8Bit();
+        QTestResult::setCurrentTestObject(testName);
+        res += QTest::qRun();
+    }
+    QTestResult::setCurrentTestObject(testObjectName);
+    QTest::qCleanup();
+    return res;
+}
+
+#define QTEST_QUICKCONTROLS_MAIN(TestCase) \
+QT_BEGIN_NAMESPACE \
+QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS \
+QT_END_NAMESPACE \
+int main(int argc, char *argv[]) \
+{ \
+    qputenv("QML_NO_TOUCH_COMPRESSION", "1"); \
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); \
+    QGuiApplication app(argc, argv); \
+    QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+    TestCase tc; \
+    QTEST_SET_MAIN_SOURCE_PATH \
+    return runTests(&tc, argc, argv); \
+}
+
+#endif // QTEST_QUICKCONTROLS_H
diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri
index 03191511..77c2cc59 100644
--- a/tests/auto/shared/util.pri
+++ b/tests/auto/shared/util.pri
@@ -1,7 +1,8 @@
-QT += core-private gui-private qml-private quick-private quicktemplates2-private
+QT += testlib-private core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2
 
 HEADERS += $$PWD/visualtestutil.h \
-           $$PWD/util.h
+           $$PWD/util.h \
+           $$PWD/qtest_quickcontrols.h
 SOURCES += $$PWD/visualtestutil.cpp \
            $$PWD/util.cpp
 
diff --git a/tests/auto/shared/visualtestutil.cpp b/tests/auto/shared/visualtestutil.cpp
index 60b8790d..c5e69812 100644
--- a/tests/auto/shared/visualtestutil.cpp
+++ b/tests/auto/shared/visualtestutil.cpp
@@ -38,6 +38,8 @@
 
 #include <QtQuick/QQuickItem>
 #include <QtCore/QDebug>
+#include <QtGui/QCursor>
+#include <QtCore/QCoreApplication>
 
 bool QQuickVisualTestUtil::delegateVisible(QQuickItem *item)
 {
@@ -69,3 +71,24 @@ void QQuickVisualTestUtil::dumpTree(QQuickItem *parent, int depth)
     }
 }
 
+void QQuickVisualTestUtil::moveMouseAway(QQuickWindow *window)
+{
+#if QT_CONFIG(cursor) // Get the cursor out of the way.
+    // Using "bottomRight() + QPoint(100, 100)" was causing issues on Ubuntu,
+    // where the window was positioned at the bottom right corner of the window
+    // (even after centering the window on the screen), so we use another position.
+    QCursor::setPos(window->geometry().bottomLeft() + QPoint(0, 10));
+#endif
+
+    // make sure hover events from QQuickWindowPrivate::flushFrameSynchronousEvents()
+    // do not interfere with the tests
+    QEvent leave(QEvent::Leave);
+    QCoreApplication::sendEvent(window, &leave);
+}
+
+void QQuickVisualTestUtil::centerOnScreen(QQuickWindow *window)
+{
+    const QRect screenGeometry = window->screen()->availableGeometry();
+    const QPoint offset = QPoint(window->width() / 2, window->height() / 2);
+    window->setFramePosition(screenGeometry.center() - offset);
+}
diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index 12f955ea..a6b52fef 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -54,6 +54,10 @@ namespace QQuickVisualTestUtil
 
     bool delegateVisible(QQuickItem *item);
 
+    void centerOnScreen(QQuickWindow *window);
+
+    void moveMouseAway(QQuickWindow *window);
+
     /*
        Find an item with the specified objectName.  If index is supplied then the
        item must also evaluate the {index} expression equal to index