Merge remote-tracking branch 'origin/5.14.1' into 5.14

Change-Id: I26504ec0e2a0ea6ec3373394ea51132b65982c92

3 files changed, 45 insertions, 4 deletions

diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1
new file mode 100644
index 00000000..d0086381
--- /dev/null
+++ b/dist/changes-5.14.1
@@ -0,0 +1,20 @@
+Qt 5.14.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.14.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+ - This release contains only minor code improvements.
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index b31d233e..601412d3 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -109,8 +109,14 @@ public:
             m_useResources = false;
 #endif
 #endif
+#ifdef Q_OS_ANDROID
+        const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/");
+#else
+        const QString prefix = QLatin1String("qrc:/");
+#endif
+
         QQuickAbstractDialog::m_decorationComponentUrl = m_useResources ?
-            QUrl("qrc:/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml") :
+            QUrl(prefix + QString("QtQuick/Dialogs/qml/DefaultWindowDecoration.qml")) :
 #ifndef QT_STATIC
             QUrl::fromLocalFile(qmlDir.filePath(QString("qml/DefaultWindowDecoration.qml")));
 #else
@@ -165,7 +171,7 @@ public:
             // @uri QtQuick.Dialogs.AbstractDialog
             qmlRegisterType<QQuickDialog1>(uri, 1, 2, "AbstractDialog"); // implementation wrapper
             QUrl dialogQmlPath = m_useResources ?
-                QUrl("qrc:/QtQuick/Dialogs/DefaultDialogWrapper.qml") :
+                QUrl(prefix + QString("QtQuick/Dialogs/DefaultDialogWrapper.qml")) :
 #ifndef QT_STATIC
                 QUrl::fromLocalFile(qmlDir.filePath("DefaultDialogWrapper.qml"));
 #else
@@ -209,6 +215,12 @@ protected:
                 mobileTouchPlatform = true;
 #endif
 
+#ifdef Q_OS_ANDROID
+        const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/");
+#else
+        const QString prefix = QLatin1String("qrc:/");
+#endif
+
         // If there is a qmldir and we have a QApplication instance (as opposed to a
         // widget-free QGuiApplication), and this isn't a mobile touch-based platform,
         // assume that the widget-based dialog will work.  Otherwise an application developer
@@ -217,7 +229,7 @@ protected:
         if (!mobileTouchPlatform && hasTopLevelWindows && widgetsDir.exists("qmldir") &&
                 QCoreApplication::instance()->inherits("QApplication")) {
             QUrl dialogQmlPath =  m_useResources ?
-                QUrl(QString("qrc:/QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) :
+                QUrl(prefix + QString("QtQuick/Dialogs/Widget%1.qml").arg(qmlName)) :
 #ifndef QT_STATIC
                     QUrl::fromLocalFile(qmlDir.filePath(QString("Widget%1.qml").arg(qmlName)));
 #else
@@ -235,12 +247,17 @@ protected:
     template <class WrapperType>
     void registerQmlImplementation(const QDir &qmlDir, const char *qmlName, const char *uri , int versionMajor, int versionMinor)
     {
+#ifdef Q_OS_ANDROID
+        const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/");
+#else
+        const QString prefix = QLatin1String("qrc:/");
+#endif
         qCDebug(lcRegistration) << "Register QML version for" << qmlName << "with uri:" << uri;
 
         QByteArray abstractTypeName = QByteArray("Abstract") + qmlName;
         qmlRegisterType<WrapperType>(uri, versionMajor, versionMinor, abstractTypeName);
         QUrl dialogQmlPath =  m_useResources ?
-                    QUrl(QString("qrc:/QtQuick/Dialogs/Default%1.qml").arg(qmlName)) :
+                    QUrl(prefix + QString("QtQuick/Dialogs/Default%1.qml").arg(qmlName)) :
 #ifndef QT_STATIC
                     QUrl::fromLocalFile(qmlDir.filePath(QString("Default%1.qml").arg(qmlName)));
 #else
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp
index 68d6ca16..794e93e2 100644
--- a/src/extras/plugin.cpp
+++ b/src/extras/plugin.cpp
@@ -73,7 +73,11 @@ QtQuickExtrasPlugin::QtQuickExtrasPlugin(QObject *parent) :
 void QtQuickExtrasPlugin::registerTypes(const char *uri)
 {
 #ifndef QT_STATIC
+# ifdef Q_OS_ANDROID
+    const QString prefix = QLatin1String("qrc:/android_rcc_bundle/qml/QtQuick/Extras");
+# else
     const QString prefix = baseUrl().toString();
+# endif // Q_OS_ANDROID
 #else
     const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
 #endif