From 93ece87be2bf7a8e905e1b462ae7705280603a27 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Feb 2023 15:40:56 +0100 Subject: Remove remains of qmake conversion from CMakeLists.txt files Pick-to: 6.5 Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136 Reviewed-by: Alexandru Croitor --- src/CMakeLists.txt | 2 -- src/imageformats/CMakeLists.txt | 4 --- src/plugins/CMakeLists.txt | 2 -- src/plugins/imageformats/CMakeLists.txt | 4 --- src/plugins/imageformats/icns/CMakeLists.txt | 5 ---- src/plugins/imageformats/jp2/CMakeLists.txt | 6 ----- src/plugins/imageformats/macheif/CMakeLists.txt | 7 ------ src/plugins/imageformats/macjp2/CMakeLists.txt | 5 ---- src/plugins/imageformats/mng/CMakeLists.txt | 6 ----- src/plugins/imageformats/tga/CMakeLists.txt | 5 ---- src/plugins/imageformats/tiff/CMakeLists.txt | 8 ------ src/plugins/imageformats/wbmp/CMakeLists.txt | 5 ---- src/plugins/imageformats/webp/CMakeLists.txt | 33 ++----------------------- 13 files changed, 2 insertions(+), 90 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c845fd..d912f7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from src.pro. - add_subdirectory(imageformats) add_subdirectory(plugins) diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt index 7fadbc8..6315170 100644 --- a/src/imageformats/CMakeLists.txt +++ b/src/imageformats/CMakeLists.txt @@ -1,12 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from imageformats.pro. - -# special case begin add_library(ImageFormats INTERFACE) qt_internal_add_docs(ImageFormats doc/qtimageformats.qdocconf ) -# special case end diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index e7c9d03..506f9c4 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,6 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from plugins.pro. - add_subdirectory(imageformats) diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt index 2d2dff2..56059f4 100644 --- a/src/plugins/imageformats/CMakeLists.txt +++ b/src/plugins/imageformats/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from imageformats.pro. - -# special case begin qt_feature_module_begin( NO_MODULE PUBLIC_FILE "qtimageformats-config.h" @@ -11,7 +8,6 @@ qt_feature_module_begin( ) include(../../imageformats/configure.cmake) qt_feature_module_end(NO_MODULE) -# special case end add_subdirectory(tga) add_subdirectory(wbmp) diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt index 6fb4813..49ee9ed 100644 --- a/src/plugins/imageformats/icns/CMakeLists.txt +++ b/src/plugins/imageformats/icns/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from icns.pro. - ##################################################################### ## QICNSPlugin Plugin: ##################################################################### @@ -20,6 +18,3 @@ qt_internal_add_plugin(QICNSPlugin Qt::Core Qt::Gui ) - -#### Keys ignored in scope 1:.:.:icns.pro:: -# OTHER_FILES = "icns.json" diff --git a/src/plugins/imageformats/jp2/CMakeLists.txt b/src/plugins/imageformats/jp2/CMakeLists.txt index 73e8817..a2819d1 100644 --- a/src/plugins/imageformats/jp2/CMakeLists.txt +++ b/src/plugins/imageformats/jp2/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from jp2.pro. - ##################################################################### ## QJp2Plugin Plugin: ##################################################################### @@ -18,7 +16,3 @@ qt_internal_add_plugin(QJp2Plugin Qt::Core Qt::Gui ) - -#### Keys ignored in scope 1:.:.:jp2.pro:: -# OTHER_FILES = "jp2.json" -# QT_FOR_CONFIG = "imageformats-private" diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt index e40aa36..b22cced 100644 --- a/src/plugins/imageformats/macheif/CMakeLists.txt +++ b/src/plugins/imageformats/macheif/CMakeLists.txt @@ -1,17 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from macheif.pro. - ##################################################################### ## QMacHeifPlugin Plugin: ##################################################################### -# special case begin find_library(FWCoreFoundation CoreFoundation) find_library(FWCoreGraphics CoreGraphics) find_library(FWImageIO ImageIO) -# special case end qt_internal_add_plugin(QMacHeifPlugin OUTPUT_NAME qmacheif @@ -31,6 +27,3 @@ qt_internal_add_plugin(QMacHeifPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:macheif.pro:: -# OTHER_FILES = "macheif.json" diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt index bc6d80c..99aa1fd 100644 --- a/src/plugins/imageformats/macjp2/CMakeLists.txt +++ b/src/plugins/imageformats/macjp2/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from macjp2.pro. - ##################################################################### ## QMacJp2Plugin Plugin: ##################################################################### @@ -25,6 +23,3 @@ qt_internal_add_plugin(QMacJp2Plugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:macjp2.pro:: -# OTHER_FILES = "macjp2.json" diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt index 7b17907..2e68b6c 100644 --- a/src/plugins/imageformats/mng/CMakeLists.txt +++ b/src/plugins/imageformats/mng/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from mng.pro. - ##################################################################### ## QMngPlugin Plugin: ##################################################################### @@ -18,7 +16,3 @@ qt_internal_add_plugin(QMngPlugin Qt::Core Qt::Gui ) - -#### Keys ignored in scope 1:.:.:mng.pro:: -# OTHER_FILES = "mng.json" -# QT_FOR_CONFIG = "imageformats-private" diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt index 6596f7d..b5a11fb 100644 --- a/src/plugins/imageformats/tga/CMakeLists.txt +++ b/src/plugins/imageformats/tga/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tga.pro. - ##################################################################### ## QTgaPlugin Plugin: ##################################################################### @@ -18,6 +16,3 @@ qt_internal_add_plugin(QTgaPlugin Qt::Core Qt::Gui ) - -#### Keys ignored in scope 1:.:.:tga.pro:: -# OTHER_FILES = "tga.json" diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt index d38a8ec..89f38d7 100644 --- a/src/plugins/imageformats/tiff/CMakeLists.txt +++ b/src/plugins/imageformats/tiff/CMakeLists.txt @@ -1,20 +1,16 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tiff.pro. - ##################################################################### ## QTiffPlugin Plugin: ##################################################################### -# special case begin # Handle the conditional finding of either system zlib or qt zlib. if(NOT QT_FEATURE_system_zlib) find_package(Qt6 COMPONENTS ZlibPrivate) elseif(NOT TARGET WrapZLIB::WrapZLIB) qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB) endif() -# special case end qt_internal_add_plugin(QTiffPlugin OUTPUT_NAME qtiff @@ -27,10 +23,6 @@ qt_internal_add_plugin(QTiffPlugin Qt::Gui ) -#### Keys ignored in scope 1:.:.:tiff.pro:: -# OTHER_FILES = "tiff.json" -# QT_FOR_CONFIG = "imageformats-private" - ## Scopes: ##################################################################### diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt index 452d994..8462f2f 100644 --- a/src/plugins/imageformats/wbmp/CMakeLists.txt +++ b/src/plugins/imageformats/wbmp/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from wbmp.pro. - ##################################################################### ## QWbmpPlugin Plugin: ##################################################################### @@ -17,6 +15,3 @@ qt_internal_add_plugin(QWbmpPlugin Qt::Core Qt::Gui ) - -#### Keys ignored in scope 1:.:.:wbmp.pro:: -# OTHER_FILES = "wbmp.json" diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt index 867c783..0b9ef9a 100644 --- a/src/plugins/imageformats/webp/CMakeLists.txt +++ b/src/plugins/imageformats/webp/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from webp.pro. - ##################################################################### ## QWebpPlugin Plugin: ##################################################################### @@ -18,10 +16,6 @@ qt_internal_add_plugin(QWebpPlugin Qt::Gui ) -#### Keys ignored in scope 1:.:.:webp.pro:: -# OTHER_FILES = "webp.json" -# QT_FOR_CONFIG = "imageformats-private" - ## Scopes: ##################################################################### @@ -157,12 +151,11 @@ qt_internal_extend_target(QWebpPlugin CONDITION NOT QT_FEATURE_system_webp qt_internal_extend_target(QWebpPlugin CONDITION ANDROID AND NOT ANDROID_EMBEDDED AND NOT QT_FEATURE_system_webp SOURCES - ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c # special case + ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c INCLUDE_DIRECTORIES - ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures # special case + ${CMAKE_ANDROID_NDK}/sources/android/cpufeatures ) -# special case begin set(neon_sources ../../../3rdparty/libwebp/sharpyuv/sharpyuv_neon.c ../../../3rdparty/libwebp/src/dsp/alpha_processing_neon.c @@ -187,25 +180,3 @@ if(NOT QT_FEATURE_system_webp) qt_internal_add_simd_part(QWebpPlugin SIMD neon SOURCES ${neon_sources}) endif() endif() -# special case end - -#### Keys ignored in scope 6:.:../../../3rdparty:../../../3rdparty/libwebp.pri:INTEGRITY: -# QMAKE_CFLAGS = "-c99" - -#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# QMAKE_EXTRA_COMPILERS = "neon_comp" -# neon_comp.commands = "$$QMAKE_CC" "-c" "$(CFLAGS)" "$$QMAKE_CFLAGS_NEON" "$(INCPATH)" "${QMAKE_FILE_IN}" -# neon_comp.dependency_type = "TYPE_C" -# neon_comp.input = "SOURCES_FOR_NEON" -# neon_comp.name = "compiling[neon]" "${QMAKE_FILE_IN}" -# neon_comp.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}" -# neon_comp.variable_out = "OBJECTS" - -#### Keys ignored in scope 13:.:../../../3rdparty:../../../3rdparty/libwebp.pri:MSVC: -# neon_comp.commands = "-Fo${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 14:.:../../../3rdparty:../../../3rdparty/libwebp.pri:else: -# neon_comp.commands = "-o" "${QMAKE_FILE_OUT}" - -#### Keys ignored in scope 15:.:../../../3rdparty:../../../3rdparty/libwebp.pri:silent: -# neon_comp.commands = "@echo" "compiling[neon]" "${QMAKE_FILE_IN}" "&&" -- cgit v1.2.1