diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 16:46:55 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-10 23:36:51 +0100 |
| commit | 08c201070817be73c17fa7e4e790ba08e94532c6 (patch) | |
| tree | ec9ccc67673d7a4e9712ba6a42764c2b0d3ace3e /src/android | |
| parent | e3ecabad228369bfc6dc82085446d7acc05ef45a (diff) | |
src: Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/android/jar/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/android/java/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/android/templates/CMakeLists.txt | 4 |
4 files changed, 3 insertions, 19 deletions
diff --git a/src/android/CMakeLists.txt b/src/android/CMakeLists.txt index b99c345ebb..045076c8d3 100644 --- a/src/android/CMakeLists.txt +++ b/src/android/CMakeLists.txt @@ -1,10 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from android.pro. - -# special case skip regeneration -# special case begin # Only build jars during Android build and install the templates for the # androiddeployqt tool. # android @@ -13,5 +9,4 @@ if (ANDROID) add_subdirectory(java) add_subdirectory(templates) endif() -# special case end diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index 0c0a86d067..170323bf03 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from jar.pro. - set(java_sources src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java @@ -19,10 +17,10 @@ set(java_sources src/org/qtproject/qt/android/QtNativeLibrariesDir.java src/org/qtproject/qt/android/QtSurface.java src/org/qtproject/qt/android/QtThread.java - src/org/qtproject/qt/android/QtServiceDelegate.java # special case + src/org/qtproject/qt/android/QtServiceDelegate.java ) -qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android # special case +qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" @@ -30,8 +28,7 @@ qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android # special case qt_path_join(destination ${INSTALL_DATADIR} "jar") -install_jar(Qt${QtBase_VERSION_MAJOR}Android # special case +install_jar(Qt${QtBase_VERSION_MAJOR}Android DESTINATION ${destination} COMPONENT Devel ) - diff --git a/src/android/java/CMakeLists.txt b/src/android/java/CMakeLists.txt index 598e374a03..32697410eb 100644 --- a/src/android/java/CMakeLists.txt +++ b/src/android/java/CMakeLists.txt @@ -3,8 +3,6 @@ # Android Java Resource files -# special case skip regeneration -# special case begin set(resource_directories "${CMAKE_CURRENT_SOURCE_DIR}/res" "${CMAKE_CURRENT_SOURCE_DIR}/src" @@ -59,5 +57,3 @@ if(NOT QT_WILL_INSTALL) DIRECTORIES ${resource_directories} DESTINATION ${destination}) endif() - -# special case end diff --git a/src/android/templates/CMakeLists.txt b/src/android/templates/CMakeLists.txt index b3728968fb..0d710f72f4 100644 --- a/src/android/templates/CMakeLists.txt +++ b/src/android/templates/CMakeLists.txt @@ -3,8 +3,6 @@ # Android template files -# special case skip regeneration -# special case begin set(template_files "${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml" "${CMAKE_CURRENT_SOURCE_DIR}/build.gradle") @@ -33,5 +31,3 @@ if(NOT QT_WILL_INSTALL) DESTINATION ${destination} ) endif() - -# special case end |