diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-08-05 19:50:29 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-11 07:28:09 +0000 |
| commit | f4a6a1544c413bd0d39c3b82a048f9d68080e390 (patch) | |
| tree | 8efbbc5c90400ebfc228dca069e12149f8b7b349 | |
| parent | 1c58ef02d27023a0ee1d47a71368021bd6a6898d (diff) | |
| download | qtquickcontrols-f4a6a1544c413bd0d39c3b82a048f9d68080e390.tar.gz | |
Android: use the correct path to DefaultWindowDecoration.qml
Regression caused by 7a806347167607172ee38c60d30808b298224a8b.
The file DefaultWindowDecoration.qml is installed under
"qml/QtQuick/Dialogs/qml/" but the path used assumes it's under
"qml/QtQuick/Dialogs/".
Fixes: QTBUG-85434
Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 7aeaa7aa1ef38ed337b41ea785852c72e48d6f22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/dialogs/plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 9470c208..4bc7d386 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -110,7 +110,7 @@ public: #endif #endif - QQuickAbstractDialog::m_decorationComponentUrl = fileLocation("DefaultWindowDecoration"); + QQuickAbstractDialog::m_decorationComponentUrl = fileLocation("qml/DefaultWindowDecoration"); // Prefer the QPA dialog helpers if the platform supports them. // Else if there is a QWidget-based implementation, check whether it's // possible to instantiate it from Qt Quick. |