diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-06-14 12:13:22 +0800 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2022-06-15 15:43:01 +0800 |
| commit | f0d465b5a49b19638fe0170d82e6bb0b617e4dcd (patch) | |
| tree | 01b14621a6bc5fa511f9c910fd219eb48b900c59 /src/quickcontrolstestutils/controlstestutils.cpp | |
| parent | ae2a307f51e12b374607ac8f008c98e4601d61e4 (diff) | |
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.
Pick-to: 6.2 6.3 6.4
Change-Id: I91ee4f1c1d69c83de3800af2f704c4c8a19d812d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quickcontrolstestutils/controlstestutils.cpp')
| -rw-r--r-- | src/quickcontrolstestutils/controlstestutils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quickcontrolstestutils/controlstestutils.cpp b/src/quickcontrolstestutils/controlstestutils.cpp index fe353481ac..df65c3234b 100644 --- a/src/quickcontrolstestutils/controlstestutils.cpp +++ b/src/quickcontrolstestutils/controlstestutils.cpp @@ -9,8 +9,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()); |