diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-08-28 18:51:46 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2019-09-07 06:53:19 +0300 |
| commit | 891b1f51b937ce3052de48dcf8416c875cf52326 (patch) | |
| tree | c690ad97979c39e9d9577946a90f015f5324037c | |
| parent | 228f0c1d2e1e4a4b160172dbf254935bb8fa2460 (diff) | |
Android: Fix cmake generator
Fixes: QTBUG-29859
Change-Id: Id0b5f9ab8b4866483361ba9f15cf51dc0d2627d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 3 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/android/android.pro | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 5c561042cd..c00faf5aac 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -42,6 +42,9 @@ CMAKE_INCLUDE_NAME = $$eval(QT.$${MODULE}.name) # (or QtCore_{libinfix_suffix}, Foo_{libinfix_suffix} on macos with -framework). CMAKE_QT_STEM = $${TARGET} +# ANDROID_ABI is set by the android toolchain file, see https://developer.android.com/ndk/guides/cmake +android: CMAKE_QT_STEM = $$replace(CMAKE_QT_STEM, "_$${QT_ARCH}", '_\$\{ANDROID_ABI\}') + # On macOS when building just a debug configuration which is not part of debug_and_release, # $${TARGET} already contains a _debug suffix, as per the following call chain: # qt_module.prf -> qt5LibraryTarget -> qtLibraryTarget -> qtPlatformTargetSuffix. diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 121db51eb5..ba5f5adf8d 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -21,7 +21,7 @@ CONFIG += simd optimize_full QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf ANDROID_LIB_DEPENDENCIES = \ - plugins/platforms/android/libqtforandroid.so + plugins/platforms/libqtforandroid.so ANDROID_BUNDLED_JAR_DEPENDENCIES = \ jar/QtAndroid.jar ANDROID_PERMISSIONS = \ diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 78632a9bea..346df84038 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -93,7 +93,3 @@ qtConfig(vulkan) { PLUGIN_TYPE = platforms load(qt_plugin) - -#Non-standard install directory, QTBUG-29859 -DESTDIR = $$DESTDIR/android -target.path = $${target.path}/android |