diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:01:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:01:09 +0100 |
| commit | ce14a8a4b2b99f91a21e1dce508688d7cd3dbe0e (patch) | |
| tree | bf11e9782c249e0774d59e52fa32299c148d442d /src/extras/plugin.cpp | |
| parent | d06862edd72ab1d9127a533de0f32499f831fb02 (diff) | |
| parent | 4d23367694e6e007f24cd00322242a81965189bf (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ifafbb9982454f62dcf1ccc1c5ed8661138dd01f8
Diffstat (limited to 'src/extras/plugin.cpp')
| -rw-r--r-- | src/extras/plugin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp index 68d6ca16a..794e93e21 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 |