diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-16 13:24:20 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-06-17 12:41:29 +0300 |
| commit | 9750e1ea0df978ea1d1dafa34158681f1ab1c75a (patch) | |
| tree | d8b9dcc372e11e9a02db6f3c4fb2c491ec5322af | |
| parent | 00f89c1ab92ffb9c2c61bcb5e89b813214f45ac7 (diff) | |
Add ${QtBase_VERSION_MAJOR} to multimedia jar file
Follow the existing pattern for jar files in Qt 6.
Change-Id: I0db5435e71743615ff6f4f7f850d0a57504346b6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/android/jar/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/multimedia/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/multimedia/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index b417d38f1..ed51a1e20 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -11,13 +11,13 @@ set(java_sources src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java ) -qt_internal_add_jar(QtAndroidMultimedia +qt_internal_add_jar(Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) -install_jar(QtAndroidMultimedia +install_jar(Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia DESTINATION jar COMPONENT Devel ) diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt index 5d0cab807..4d5240d9f 100644 --- a/src/multimedia/.prev_CMakeLists.txt +++ b/src/multimedia/.prev_CMakeLists.txt @@ -121,7 +121,7 @@ qt_internal_add_simd_part(Multimedia SIMD avx2 if(ANDROID) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils + jar/Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES lib/libQt6MultimediaQuick.so:Qt6Quick diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index 47851c296..6be6e195b 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -108,8 +108,8 @@ qt_internal_add_simd_part(Multimedia SIMD avx2 if(ANDROID) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils - jar/QtAndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtAudioDeviceManager + jar/Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils + jar/Qt${QtMultimedia_VERSION_MAJOR}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtAudioDeviceManager ) set_property(TARGET Multimedia APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES lib/libQt6MultimediaQuick.so:Qt6Quick |