diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2021-04-22 16:52:44 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-04-23 07:26:37 +0000 |
| commit | 2771ee1e72012dd87ddaa7142a107952cc0565e1 (patch) | |
| tree | 61e8ac7a63a94462970e80592b998c94faf6b933 | |
| parent | e31cc41614a6bc080719d4312a0a1843c67343b2 (diff) | |
Android: Libs names changed for cmake and qmake
Libs need to be renamed from Qt5 prefix to Qt6
Change-Id: I9ae5f591cbcf7a44c0fe7361f127372c9a73a406
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/multimedia/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/multimedia/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/multimedia/multimedia.pro | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt index 3de0921f0..c93252565 100644 --- a/src/multimedia/.prev_CMakeLists.txt +++ b/src/multimedia/.prev_CMakeLists.txt @@ -124,11 +124,11 @@ if(ANDROID) jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - lib/libQt5MultimediaQuick.so:Qt5Quick + lib/libQt6MultimediaQuick.so:Qt6Quick plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_FILES - lib/libQt5MultimediaQuick.so + lib/libQt6MultimediaQuick.so ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.CAMERA android.permission.RECORD_AUDIO diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 59e9030c5..a2843fb56 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -117,11 +117,11 @@ if(ANDROID) jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - lib/libQt5MultimediaQuick.so:Qt5Quick + lib/libQt6MultimediaQuick.so:Qt6Quick plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_FILES - lib/libQt5MultimediaQuick.so + lib/libQt6MultimediaQuick.so ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.CAMERA android.permission.RECORD_AUDIO diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 1cd190c4d..ec03ae8e5 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -48,9 +48,9 @@ ANDROID_BUNDLED_JAR_DEPENDENCIES = \ jar/Qt$${QT_MAJOR_VERSION}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils ANDROID_LIB_DEPENDENCIES = \ plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so \ - lib/libQt5MultimediaQuick.so:Qt5Quick + lib/libQt6MultimediaQuick.so:Qt6Quick ANDROID_BUNDLED_FILES += \ - lib/libQt5MultimediaQuick.so + lib/libQt6MultimediaQuick.so ANDROID_PERMISSIONS += \ android.permission.CAMERA \ android.permission.RECORD_AUDIO |