diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2023-08-17 09:09:45 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-22 07:49:53 +0000 |
| commit | d435fdf2806b8a4fc267d6808d615c89c5120a0d (patch) | |
| tree | e3ce1967cffe38892b75f925c825f6f6c779c027 | |
| parent | 259eb346924cb47e252baa7d0f9e621e0ad8560e (diff) | |
Restore style path for backwards compatibility
This was broken since commit 4395ca0fdd04d4e8655f2c8765ff229e236bfdc2
[ChangeLog] Restored style path /QtQuick/VirtualKeyboard/content/styles
for backwards compatibility.
Fixes: QTBUG-116078
Change-Id: Iadef58af5bea2dd5849f2a15500eac8a40c38eee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit e5bf53cc61f574bc84ad4db448a076e093791a39)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/settings/qquickvirtualkeyboardsettings.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/styles/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tests/auto/styles/data/tst_styles.qml | 4 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/settings/qquickvirtualkeyboardsettings.cpp b/src/settings/qquickvirtualkeyboardsettings.cpp index b80590db..1998a1d9 100644 --- a/src/settings/qquickvirtualkeyboardsettings.cpp +++ b/src/settings/qquickvirtualkeyboardsettings.cpp @@ -62,6 +62,9 @@ public: stylePathList += stylesPath; } + // Path for backwards compatibility + stylePathList << QLatin1String("qrc:/QtQuick/VirtualKeyboard/content/styles/"); + for (const QString &stylePath : std::as_const(stylePathList)) { QString filePath = buildStyleFilePath(stylePath, name); bool pathExist = false; diff --git a/tests/auto/styles/CMakeLists.txt b/tests/auto/styles/CMakeLists.txt index 96462675..92f77c18 100644 --- a/tests/auto/styles/CMakeLists.txt +++ b/tests/auto/styles/CMakeLists.txt @@ -24,6 +24,24 @@ qt_internal_add_test(tst_styles TESTDATA ${test_data} ) +qt_internal_add_resource(tst_styles "test_res" + PREFIX + "/qt/qml/QtQuick/VirtualKeyboard/Styles/test_res" + BASE + "data/QtQuick/VirtualKeyboard/Styles/test" + FILES + "data/QtQuick/VirtualKeyboard/Styles/test/style.qml" +) + +qt_internal_add_resource(tst_styles "test_res_compat" + PREFIX + "/QtQuick/VirtualKeyboard/content/styles/test_res_compat" + BASE + "data/QtQuick/VirtualKeyboard/Styles/test" + FILES + "data/QtQuick/VirtualKeyboard/Styles/test/style.qml" +) + #### Keys ignored in scope 1:.:.:styles.pro:<TRUE>: # DISTFILES = "data/tst_styles.qml" "data/QtQuick/VirtualKeyboard/Styles/test/style.qml" # OTHER_FILES = "$$PWD/data/tst_styles.qml" diff --git a/tests/auto/styles/data/tst_styles.qml b/tests/auto/styles/data/tst_styles.qml index 85c55ed3..f5661b07 100644 --- a/tests/auto/styles/data/tst_styles.qml +++ b/tests/auto/styles/data/tst_styles.qml @@ -16,7 +16,9 @@ Item { return [ { tag: "default", result: "default"}, { tag: "retro", result: "retro"}, // in-source alternate style - { tag: "test", result: "test"} // out-of-source alternate style + { tag: "test", result: "test"}, // out-of-source alternate style + { tag: "test_res", result: "test_res"}, // default resource path + { tag: "test_res_compat", result: "test_res_compat"}, // compatibility resource path ]; } |