From 7aeaa7aa1ef38ed337b41ea785852c72e48d6f22 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 5 Aug 2020 19:50:29 +0300 Subject: 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 Pick-to: 5.15 Change-Id: I536e3d805896815ae63c43c25b60c0e810dc3cab Reviewed-by: Andy Shaw Reviewed-by: Shawn Rutledge --- src/dialogs/plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 2f34c87f..5b192505 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. -- cgit v1.2.1