diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2019-08-14 17:51:06 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2019-08-28 12:32:50 +0300 |
| commit | cad232b6536351c68bd11531fa61deaac3226a2f (patch) | |
| tree | 3f304e4c923ee6953a563037fa40b1b6eb064a64 | |
| parent | 3fbaa2618c0c43a4dd6550666a789327f0d8f2cc (diff) | |
Android multiarch support
Change-Id: Ifa70d6cb36be385280364cca9dd4e31b43aa9a18
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/qml/qml/qml.pri | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index 08591b5237..2e9c6f3de6 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -186,5 +186,7 @@ qtConfig(qml-network) { $$PWD/qqmltypeloadernetworkreplyproxy.cpp } +android: DEFINES += LIBS_SUFFIX='\\"_$${QT_ARCH}.so\\"' + include(ftw/ftw.pri) include(v8/v8.pri) diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 7c9c0da01a..31a7004407 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1852,9 +1852,15 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader, QLatin1String(".so"), QLatin1String(".bundle") }; -# else // Unix +#else // Unix static const QString prefix = QLatin1String("lib"); - static const QStringList suffixes = { QLatin1String(".so") }; + static const QStringList suffixes = { +# if defined(Q_OS_ANDROID) + QStringLiteral(LIBS_SUFFIX), +# endif + QLatin1String(".so") + + }; #endif return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, suffixes, prefix); |