diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 12:59:07 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 16:31:09 +0200 |
| commit | fe3bd212fc85b6c3a64bb8bd5beca4ff4d3493a1 (patch) | |
| tree | b96dd84abfb6ac25b26539999bf2d7d427f347dd /cmake/QtPlatformAndroid.cmake | |
| parent | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (diff) | |
| parent | ae97d11589dd03edeea0475163e6110869143b35 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
This changes many different CMake places to mention Qt6 instead of
Qt5.
Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.
Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4
Diffstat (limited to 'cmake/QtPlatformAndroid.cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 1d601e684b..70768947a0 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -162,12 +162,12 @@ function(qt_android_generate_deployment_settings target) # Host Qt Android install path if (NOT QT_BUILDING_QT) - set(file_check "${Qt5_DIR}/plugins/platforms/android/libqtforandroid.so") + set(file_check "${Qt6_DIR}/plugins/platforms/android/libqtforandroid.so") if (NOT EXISTS ${file_check}) message(SEND_ERROR "Detected Qt installation does not contain libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.") return() endif() - set(qt_android_install_dir ${Qt5_Dir}) + set(qt_android_install_dir ${Qt6_Dir}) else() # Building from source, use the same install prefix set(qt_android_install_dir ${CMAKE_INSTALL_PREFIX}) |