QQuickApplicationHelper: move initialProperties before qmlImportPaths

It's far more common to want to initialize certain properties in the
QML file, so this should come before qmlImportPaths so that users of
the (private) API do not need to pass an empty QStringList (for
qmlImportPaths) each time they want to provide initial properties.

Change-Id: I91ee4f1c1d69c83de3800af2f704c4c8a19d812d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit f0d465b5a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

src/quickcontrolstestutils/controlstestutils.cpp

@@ -34,8 +34,8 @@
 #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
 
 QQuickControlsTestUtils::QQuickControlsApplicationHelper::QQuickControlsApplicationHelper(QQmlDataTest *testCase,
-    const QString &testFilePath, const QStringList &qmlImportPaths, const QVariantMap &initialProperties)
-    : QQuickApplicationHelper(testCase, testFilePath, qmlImportPaths, initialProperties)
+    const QString &testFilePath, const QVariantMap &initialProperties, const QStringList &qmlImportPaths)
+    : QQuickApplicationHelper(testCase, testFilePath, initialProperties, qmlImportPaths)
 {
     if (ready)
         appWindow = qobject_cast<QQuickApplicationWindow*>(cleanup.data());

src/quickcontrolstestutils/controlstestutils_p.h

@@ -54,8 +54,8 @@ namespace QQuickControlsTestUtils
     {
     public:
         QQuickControlsApplicationHelper(QQmlDataTest *testCase, const QString &testFilePath,
-                const QStringList &qmlImportPaths = {},
-                const QVariantMap &initialProperties = {});
+                const QVariantMap &initialProperties = {},
+                const QStringList &qmlImportPaths = {});
 
         QQuickApplicationWindow *appWindow = nullptr;
     };

src/quickcontrolstestutils/dialogstestutils_p.h

@@ -94,7 +94,7 @@ class DialogTestHelper
 public:
     DialogTestHelper(QQmlDataTest *testCase, const QString &testFilePath,
             const QStringList &qmlImportPaths = {}, const QVariantMap &initialProperties = {}) :
-        appHelper(testCase, testFilePath, qmlImportPaths, initialProperties)
+        appHelper(testCase, testFilePath, initialProperties, qmlImportPaths)
     {
         if (!appHelper.ready)
             return;

src/quicktestutils/quick/visualtestutils.cpp

@@ -165,7 +165,8 @@ QQuickItem *QQuickVisualTestUtils::findViewDelegateItem(QQuickItemView *itemView
     return itemView->itemAtIndex(index);
 }
 
-QQuickVisualTestUtils::QQuickApplicationHelper::QQuickApplicationHelper(QQmlDataTest *testCase, const QString &testFilePath, const QStringList &qmlImportPaths, const QVariantMap &initialProperties)
+QQuickVisualTestUtils::QQuickApplicationHelper::QQuickApplicationHelper(QQmlDataTest *testCase,
+    const QString &testFilePath, const QVariantMap &initialProperties, const QStringList &qmlImportPaths)
 {
     for (const auto &path : qmlImportPaths)
         engine.addImportPath(path);

src/quicktestutils/quick/visualtestutils_p.h

@@ -172,8 +172,8 @@ namespace QQuickVisualTestUtils
     {
     public:
         QQuickApplicationHelper(QQmlDataTest *testCase, const QString &testFilePath,
-                const QStringList &qmlImportPaths = {},
-                const QVariantMap &initialProperties = {});
+                const QVariantMap &initialProperties = {},
+                const QStringList &qmlImportPaths = {});
 
         // Return a C-style string instead of QString because that's what QTest uses for error messages,
         // so it saves code at the calling site.

tests/auto/quickcontrols2/styleimportscompiletimeqmlonly/tst_styleimportscompiletimeqmlonly.cpp

@@ -68,7 +68,7 @@ tst_StyleImportsCompileTimeQmlOnly::tst_StyleImportsCompileTimeQmlOnly()
 void tst_StyleImportsCompileTimeQmlOnly::importQmlOnlyStyleWithoutControls()
 {
     QQuickControlsApplicationHelper helper(this,
-        QLatin1String("importQmlOnlyStyleWithoutControls.qml"), QStringList() << dataDirectory());
+        QLatin1String("importQmlOnlyStyleWithoutControls.qml"), {}, QStringList() << dataDirectory());
     QVERIFY2(helper.ready, helper.failureMessage());
 
     auto button = helper.window->property("button").value<QQuickButton*>();