diff options
105 files changed, 88 insertions, 789 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index a597b47b52..493f6bddff 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -1,6 +1,3 @@ -# special case skip regeneration -# The file is maintained manually - if(QT_FEATURE_gui AND QT_FEATURE_png AND NOT QT_FEATURE_system_png) add_subdirectory(libpng) endif() diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 709a32f8ba..83566064b3 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from harfbuzz-ng.pro. - ##################################################################### ## BundledHarfbuzz Generic Library: ##################################################################### @@ -7,7 +5,7 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz QMAKE_LIB_NAME harfbuzz STATIC - SKIP_AUTOMOC # special case + SKIP_AUTOMOC SOURCES hb-dummy.cc src/hb.h @@ -64,8 +62,8 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz HB_NO_UNICODE_FUNCS QT_NO_VERSION_TAGGING INCLUDE_DIRECTORIES - $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case - "${CMAKE_CURRENT_SOURCE_DIR}" # special case + $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> + "${CMAKE_CURRENT_SOURCE_DIR}" PUBLIC_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz> ) @@ -80,16 +78,9 @@ endif() qt_disable_warnings(BundledHarfbuzz) qt_set_symbol_visibility_hidden(BundledHarfbuzz) -#### Keys ignored in scope 1:.:.:harfbuzz-ng.pro:<TRUE>: -# OTHER_FILES = "$$PWD/src/harfbuzz.cc" -# SHAPERS = "opentype" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE: -# SHAPERS = "coretext" - qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX DEFINES HAVE_PTHREAD @@ -102,7 +93,7 @@ qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32 HB_NO_WIN1256 ) -qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case +qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE SOURCES src/hb-ot.h src/hb-ot-cff1-std-str.hh diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt index 4f8170bd02..8f59719f28 100644 --- a/src/3rdparty/libpng/CMakeLists.txt +++ b/src/3rdparty/libpng/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from libpng.pro. - ##################################################################### ## BundledLibpng Generic Library: ##################################################################### diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt index 0b6d608cbb..a688cf608a 100644 --- a/src/3rdparty/pcre2/CMakeLists.txt +++ b/src/3rdparty/pcre2/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from pcre2.pro. - ##################################################################### ## BundledPcre2 Generic Library: ##################################################################### @@ -77,9 +75,4 @@ qt_internal_extend_target(BundledPcre2 CONDITION WIN32 PCRE2_STATIC ) -#### Keys ignored in scope 8:.:.:pcre2.pri:QT_FEATURE_intelcet: -# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" - -# special case begin qt_internal_apply_intel_cet(BundledPcre2 PRIVATE) -# special case end diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52371c84bf..3fd80a259d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# special case skip regeneration - # We need to include the features of a few modules before they are actually declared. # The feature values are used as conditions for deciding whether bundled 3rd party libraries # should be built. 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 diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index cb007538b6..73aa12dea0 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from concurrent.pro. - ##################################################################### ## Concurrent Module: ##################################################################### @@ -50,4 +48,3 @@ qt_internal_extend_target(Concurrent CONDITION MSVC AND (TEST_architecture_arch qt_internal_add_docs(Concurrent doc/qtconcurrent.qdocconf ) - diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 0ae76fe3ec..f9dd14e4ff 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from corelib.pro. - -# special case begin qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2) qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB) @@ -32,7 +29,6 @@ endif() qt_path_join(config_build_dir ${QT_CONFIG_BUILD_DIR} "${INSTALL_CMAKE_NAMESPACE}Core") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/QtInstallPaths.cmake.in" "${config_build_dir}/QtInstallPaths.cmake" @ONLY) -# special case end ##################################################################### ## Core Module: @@ -317,29 +313,23 @@ qt_internal_add_module(Core QT_NO_USING_NAMESPACE QT_TYPESAFE_FLAGS INCLUDE_DIRECTORIES - "${CMAKE_CURRENT_BINARY_DIR}/global" # special case + "${CMAKE_CURRENT_BINARY_DIR}/global" "${CMAKE_CURRENT_BINARY_DIR}/kernel" # for moc_qobject.cpp to be found by qobject.cpp - # ../3rdparty/md4 # special case remove - # ../3rdparty/md5 # special case remove - # ../3rdparty/sha3 # special case remove ../3rdparty/tinycbor/src LIBRARIES - Qt::GlobalConfigPrivate # special case + Qt::GlobalConfigPrivate WrapZLIB::WrapZLIB PRECOMPILED_HEADER "global/qt_pch.h" GENERATE_CPP_EXPORTS - PUBLIC_LIBRARIES # special case: - Qt::Platform # special case: - # special case begin - # Generated in QtBaseGlobalTargets + PUBLIC_LIBRARIES + Qt::Platform EXTRA_CMAKE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Qt6CTestMacros.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/Qt6CoreConfigureFileTemplate.in" "${CMAKE_CURRENT_SOURCE_DIR}/Qt6CoreDeploySupport.cmake" "${config_build_dir}/QtInstallPaths.cmake" ${corelib_extra_cmake_files} - # special case end ) _qt_internal_setup_deploy_support() @@ -352,7 +342,6 @@ foreach(src ${corelib_no_pch_sources}) qt_update_ignore_pch_source(Core ${src}) endforeach() -# special case begin add_dependencies(Core qmodule_pri) if (NOT QT_NAMESPACE STREQUAL "") @@ -427,7 +416,6 @@ if ((LINUX OR HURD) AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS) target_compile_definitions(Core PRIVATE ELF_INTERPRETER="${ELF_INTERPRETER}") endif() endif() -# special case end qt_internal_add_simd_part(Core SIMD mips_dsp SOURCES @@ -442,7 +430,7 @@ endif() if(ANDROID) set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtBase_VERSION_MAJOR}Android.jar # special case + jar/Qt${QtBase_VERSION_MAJOR}Android.jar ) set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES ${INSTALL_PLUGINSDIR}/platforms/libplugins_platforms_qtforandroid.so @@ -452,54 +440,9 @@ if(ANDROID) ) endif() -#### Keys ignored in scope 1:.:.:corelib.pro:<TRUE>: -# CMAKE_DISABLED_FEATURES = "$$join(QT_DISABLED_FEATURES, "$$escape_expand(\\n) ")" -# CMAKE_HOST_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA/src], $$[QT_INSTALL_PREFIX])" -# CMAKE_INSTALL_DATA_DIR = "$$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX])" -# HOST_BINS = "$$[QT_HOST_BINS]" -# INSTALLS = "ctest_qt5_module_files" "cmake_qt5_umbrella_module_files" -# MODULE = "core" -# MODULE_CONFIG = "moc" "resources" -# QMAKE_PKGCONFIG_VARIABLES = "host_bins" "qt_conf" -# QMAKE_SUBSTITUTES = "ctest_macros_file" "cmake_umbrella_config_file" "cmake_umbrella_config_module_location" "cmake_umbrella_config_module_location_for_install" "cmake_umbrella_config_version_file" "cmake_extras_mkspec_dir" "cmake_extras_mkspec_dir_for_install" -# cmake_extras_mkspec_dir.input = "$$PWD/Qt5CoreConfigExtrasMkspecDir.cmake.in" -# cmake_extras_mkspec_dir.output = "$$DESTDIR/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake" -# cmake_extras_mkspec_dir_for_install.input = "$$PWD/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in" -# cmake_extras_mkspec_dir_for_install.output = "$$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake" -# cmake_qt5_umbrella_module_files.files = "$$cmake_umbrella_config_file.output" "$$cmake_umbrella_config_version_file.output" "$$cmake_umbrella_config_module_location_for_install.output" -# cmake_qt5_umbrella_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5" -# cmake_umbrella_config_file.input = "$$PWD/Qt5Config.cmake.in" -# cmake_umbrella_config_file.output = "$$DESTDIR/cmake/Qt5/Qt5Config.cmake" -# cmake_umbrella_config_module_location.input = "$$PWD/Qt5ModuleLocation.cmake.in" -# cmake_umbrella_config_module_location.output = "$$DESTDIR/cmake/Qt5/Qt5ModuleLocation.cmake" -# cmake_umbrella_config_module_location_for_install.input = "$$PWD/Qt5ModuleLocationForInstall.cmake.in" -# cmake_umbrella_config_module_location_for_install.output = "$$DESTDIR/cmake/install/Qt5/Qt5ModuleLocation.cmake" -# cmake_umbrella_config_version_file.input = "$$PWD/../../mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in" -# cmake_umbrella_config_version_file.output = "$$DESTDIR/cmake/Qt5/Qt5ConfigVersion.cmake" -# ctest_macros_file.CONFIG = "verbatim" -# ctest_macros_file.input = "$$PWD/Qt5CTestMacros.cmake" -# ctest_macros_file.output = "$$DESTDIR/cmake/Qt5Core/Qt5CTestMacros.cmake" -# ctest_qt5_module_files.files = "$$ctest_macros_file.output" "$$cmake_extras_mkspec_dir_for_install.output" -# ctest_qt5_module_files.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5Core" -# host_bins.name = "host_bins" -# host_bins.variable = "HOST_BINS" -# qt_conf.name = "qt_config" -# qt_conf.variable = "QT_CONFIG" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:corelib.pro:QT_FEATURE_gc_binaries: -# MODULE_CONFIG = "gc_binaries" - -# special case begin -# remove because it's handled manually -#qt_internal_extend_target(Core CONDITION NOT QT_NAMESPACE_ISEMPTY -# PUBLIC_DEFINES -# QT_NAMESPACE= -#) -# special case end - qt_internal_extend_target(Core CONDITION ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) OR @@ -511,7 +454,7 @@ qt_internal_extend_target(Core qt_internal_extend_target(Core CONDITION ANDROID DEFINES - LIBS_SUFFIX="_${ANDROID_ABI}.so" # special case + LIBS_SUFFIX="_${ANDROID_ABI}.so" ) qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386") @@ -647,24 +590,6 @@ qt_internal_extend_target(Core CONDITION QCC AND (CMAKE_CXX_COMPILER_VERSION VER PUBLIC_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-Wno-invalid-offsetof> ) -#### Keys ignored in scope 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR): -# CMAKE_HOST_DATA_DIR = "$$[QT_HOST_DATA/src]/" -# CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = "True" - -#### Keys ignored in scope 15:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR): -# CMAKE_INSTALL_DATA_DIR = "$$[QT_HOST_DATA]/" -# CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE = "True" - -# special case begin -# Remove this because it's handled manually -#qt_internal_extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_) -# DEFINES -# ELF_INTERPRETER=\\\"=Creadelf-l/bin/ls|perl-n-e\'['quote', ['if', ['/program', 'interpreter:', ['.*'], ']/'], '{', 'print', '$1;', '}']]\'\\\" -# LINK_OPTIONS -# "-Wl,-e,qt_core_boilerplate" -#) -# special case end - qt_internal_extend_target(Core CONDITION LINUX AND QT_BUILD_SHARED_LIBS SOURCES global/minimum-linux_p.h @@ -1416,7 +1341,6 @@ if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET) set_property(TARGET Core APPEND PROPERTY EXPORT_PROPERTIES "QT_DARWIN_MIN_DEPLOYMENT_TARGET") endif() -# special case end qt_internal_generate_tracepoints(Core core SOURCES diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index a4f5bf9112..8022f265b2 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from dbus.pro. - ##################################################################### ## DBus Module: ##################################################################### @@ -57,9 +55,6 @@ qt_internal_add_module(DBus set_source_files_properties(qdbusmarshaller.cpp PROPERTIES HEADER_FILE_ONLY ON) # special case: This file is included by qdbusargument.cpp -#### Keys ignored in scope 1:.:.:dbus.pro:<TRUE>: -# MODULE_CONFIG = "dbusadaptors" "dbusinterfaces" - ## Scopes: ##################################################################### @@ -80,4 +75,3 @@ qt_internal_extend_target(DBus CONDITION WIN32 qt_internal_add_docs(DBus doc/qtdbus.qdocconf ) - diff --git a/src/entrypoint/CMakeLists.txt b/src/entrypoint/CMakeLists.txt index 845ce419ea..21385eaba0 100644 --- a/src/entrypoint/CMakeLists.txt +++ b/src/entrypoint/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# special case begin -# special case skip regeneration if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") return() endif() @@ -150,5 +148,3 @@ qt_internal_export_additional_targets_file( TARGETS ${export_targets} EXPORT_NAME_PREFIX ${export_name_prefix} CONFIG_INSTALL_DIR "${config_install_dir}") - -# special case end diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index a08cfa5dc0..69043b006a 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from network.pro. - ##################################################################### ## Network Module: ##################################################################### @@ -71,9 +69,6 @@ qt_internal_add_module(Network GENERATE_PRIVATE_CPP_EXPORTS ) -#### Keys ignored in scope 1:.:.:network.pro:<TRUE>: -# QMAKE_LIBS = "$$QMAKE_LIBS_NETWORK" - ## Scopes: ##################################################################### @@ -278,19 +273,19 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_libproxy AND UNIX AND NOT PkgConfig::Libproxy ) -qt_internal_extend_target(Network CONDITION ANDROID # special case +qt_internal_extend_target(Network CONDITION ANDROID SOURCES kernel/qnetworkproxy_android.cpp ) -qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT APPLE AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) # special case +qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT APPLE AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT) SOURCES kernel/qnetworkproxy_generic.cpp ) if(ANDROID AND (ANDROID)) set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES - jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar # special case + jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar ) endif() @@ -382,7 +377,7 @@ qt_internal_extend_target(Network CONDITION WIN32 PUBLIC_LIBRARIES ws2_32) # spe qt_internal_extend_target(Network CONDITION QNX PUBLIC_LIBRARIES socket) # special case: mkspecs/common/qcc-base-qnx.conf -qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl) # special case +qt_internal_extend_target(Network CONDITION SOLARIS PUBLIC_LIBRARIES socket nsl) if (WIN32) set_source_files_properties(Network # include windows.h (causing clashes with "interface" define) diff --git a/src/network/android/jar/CMakeLists.txt b/src/network/android/jar/CMakeLists.txt index c02223fc56..b5172b6aba 100644 --- a/src/network/android/jar/CMakeLists.txt +++ b/src/network/android/jar/CMakeLists.txt @@ -1,13 +1,11 @@ # 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/network/QtNetwork.java ) -qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case +qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" @@ -15,8 +13,7 @@ qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case qt_path_join(destination ${INSTALL_DATADIR} "jar") -install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case +install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork DESTINATION ${destination} COMPONENT Devel ) - diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 3f5e34e9d0..3f3a0d43b8 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from opengl.pro. - ##################################################################### ## OpenGL Module: ##################################################################### @@ -114,4 +112,3 @@ qt_internal_generate_tracepoints(OpenGL opengl qt_internal_add_docs(OpenGL doc/qtopengl.qdocconf ) - diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt index 77df00a541..e28b30bd8e 100644 --- a/src/openglwidgets/CMakeLists.txt +++ b/src/openglwidgets/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from openglwidgets.pro. - ##################################################################### ## OpenGLWidgets Module: ##################################################################### diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index ec9ede6cdb..686c6213d2 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from platformsupport.pro. - add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon) diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index a9dcd6b61e..8a134ac0fa 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from devicediscovery.pro. - ##################################################################### ## DeviceDiscoverySupportPrivate Module: ##################################################################### @@ -19,10 +17,6 @@ qt_internal_add_module(DeviceDiscoverySupportPrivate Qt::CorePrivate ) -#### Keys ignored in scope 1:.:.:devicediscovery.pro:<TRUE>: -# MODULE = "devicediscovery_support" -# QT_FOR_CONFIG = "gui-private" - ## Scopes: ##################################################################### diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index c5cf7d65d0..fba69bce5a 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from fbconvenience.pro. - ##################################################################### ## FbSupportPrivate Module: ##################################################################### @@ -25,6 +23,3 @@ qt_internal_add_module(FbSupportPrivate PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) - -#### Keys ignored in scope 1:.:.:fbconvenience.pro:<TRUE>: -# MODULE = "fb_support" diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 6f753c6cd4..1802c8b5a1 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -1,12 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from input.pro. - -qt_find_package(Libinput) # special case -qt_find_package(XKB) # special case -qt_find_package(Tslib) # special case -qt_find_package(Mtdev) # special case +qt_find_package(Libinput) +qt_find_package(XKB) +qt_find_package(Tslib) +qt_find_package(Mtdev) ##################################################################### ## InputSupportPrivate Module: @@ -26,9 +24,6 @@ qt_internal_add_module(InputSupportPrivate "../../corelib/global/qt_pch.h" ) -#### Keys ignored in scope 2:.:.:input-support.pro:<TRUE>: -# MODULE = "input_support" - ## Scopes: ##################################################################### diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index 57aab77e2b..e97b398a63 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from kmsconvenience.pro. - -qt_find_package(Libdrm) # special case +qt_find_package(Libdrm) ##################################################################### ## KmsSupportPrivate Module: @@ -22,6 +20,3 @@ qt_internal_add_module(KmsSupportPrivate Qt::CorePrivate Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>: -# MODULE = "kms_support" diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 22bfbd5c9c..308aa800bd 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from plugins.pro. - if(TARGET Qt::Sql) add_subdirectory(sqldrivers) endif() diff --git a/src/plugins/generic/CMakeLists.txt b/src/plugins/generic/CMakeLists.txt index d03980ff8c..313fafc15c 100644 --- a/src/plugins/generic/CMakeLists.txt +++ b/src/plugins/generic/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from generic.pro. - if(QT_FEATURE_evdev) add_subdirectory(evdevmouse) add_subdirectory(evdevtouch) diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index 7744a5ba0a..53be12face 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from evdevkeyboard.pro. - ##################################################################### ## QEvdevKeyboardPlugin Plugin: ##################################################################### @@ -20,7 +18,3 @@ qt_internal_add_plugin(QEvdevKeyboardPlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:evdevkeyboard.pro:<TRUE>: -# OTHER_FILES = "evdevkeyboard.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index e6031875c6..e0836ecccc 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from evdevmouse.pro. - ##################################################################### ## QEvdevMousePlugin Plugin: ##################################################################### @@ -20,7 +18,3 @@ qt_internal_add_plugin(QEvdevMousePlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:evdevmouse.pro:<TRUE>: -# OTHER_FILES = "evdevmouse.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index a316e27008..ef21469f70 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from evdevtablet.pro. - ##################################################################### ## QEvdevTabletPlugin Plugin: ##################################################################### @@ -20,7 +18,3 @@ qt_internal_add_plugin(QEvdevTabletPlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:evdevtablet.pro:<TRUE>: -# OTHER_FILES = "evdevtablet.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index 1d61df010b..f3f489586a 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from evdevtouch.pro. - ##################################################################### ## QEvdevTouchScreenPlugin Plugin: ##################################################################### @@ -20,7 +18,3 @@ qt_internal_add_plugin(QEvdevTouchScreenPlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:evdevtouch.pro:<TRUE>: -# OTHER_FILES = "evdevtouch.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index 211b2cb669..f92b3d5353 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from libinput.pro. - ##################################################################### ## QLibInputPlugin Plugin: ##################################################################### @@ -20,7 +18,3 @@ qt_internal_add_plugin(QLibInputPlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:libinput.pro:<TRUE>: -# OTHER_FILES = "libinput.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index e5bf6b80dc..8512133799 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tslib.pro. - -qt_find_package(Tslib) # special case +qt_find_package(Tslib) ##################################################################### ## QTsLibPlugin Plugin: @@ -23,7 +21,3 @@ qt_internal_add_plugin(QTsLibPlugin Qt::GuiPrivate Qt::InputSupportPrivate ) - -#### Keys ignored in scope 1:.:.:tslib.pro:<TRUE>: -# OTHER_FILES = "tslib.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index b9ddc0d27a..b03ed9e360 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tuiotouch.pro. - ##################################################################### ## QTuioTouchPlugin Plugin: ##################################################################### @@ -27,7 +25,3 @@ qt_internal_add_plugin(QTuioTouchPlugin Qt::GuiPrivate Qt::Network ) - -#### Keys ignored in scope 1:.:.:tuiotouch.pro:<TRUE>: -# OTHER_FILES = "tuiotouch.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt index 89bd5d6501..c5ab716d00 100644 --- a/src/plugins/imageformats/CMakeLists.txt +++ b/src/plugins/imageformats/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from imageformats.pro. - if(QT_FEATURE_ico) add_subdirectory(ico) endif() diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index 61b4a3ef1b..b56859a264 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from gif.pro. - ##################################################################### ## QGifPlugin Plugin: ##################################################################### @@ -13,10 +11,7 @@ qt_internal_add_plugin(QGifPlugin SOURCES main.cpp qgifhandler.cpp qgifhandler_p.h - LIBRARIES # special case - Qt::Gui # special case - Qt::GuiPrivate # special case + LIBRARIES + Qt::Gui + Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>: -# OTHER_FILES = "gif.json" diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index 719696a77c..d590489307 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from ico.pro. - ##################################################################### ## QICOPlugin Plugin: ##################################################################### @@ -18,6 +16,3 @@ qt_internal_add_plugin(QICOPlugin Qt::CorePrivate Qt::Gui ) - -#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>: -# OTHER_FILES = "ico.json" diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index a425e48b65..6b077a7647 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from jpeg.pro. - qt_find_package(WrapJpeg PROVIDED_TARGETS WrapJpeg::WrapJpeg) ##################################################################### diff --git a/src/plugins/platforminputcontexts/CMakeLists.txt b/src/plugins/platforminputcontexts/CMakeLists.txt index e31a24aae1..78b3ec99d9 100644 --- a/src/plugins/platforminputcontexts/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from platforminputcontexts.pro. - if(QT_FEATURE_xkbcommon) add_subdirectory(compose) endif() diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index 3f967bba06..9e71a7a07c 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -1,14 +1,12 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from compose.pro. - ##################################################################### ## QComposePlatformInputContextPlugin Plugin: ##################################################################### -qt_find_package(XKB) # special case -pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case +qt_find_package(XKB) +pkg_get_variable(PKG_X11_PREFIX x11 prefix) qt_internal_add_plugin(QComposePlatformInputContextPlugin OUTPUT_NAME composeplatforminputcontextplugin @@ -24,7 +22,3 @@ qt_internal_add_plugin(QComposePlatformInputContextPlugin Qt::GuiPrivate XKB::XKB ) - -#### Keys ignored in scope 1:.:.:compose.pro:<TRUE>: -# OTHER_FILES = "$$PWD/compose.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index fa28289bc8..54847e86fd 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from ibus.pro. - ##################################################################### ## QIbusPlatformInputContextPlugin Plugin: ##################################################################### @@ -25,7 +23,3 @@ qt_internal_add_plugin(QIbusPlatformInputContextPlugin Qt::GuiPrivate XKB::XKB ) - -#### Keys ignored in scope 1:.:.:ibus.pro:<TRUE>: -# OTHER_FILES = "$$PWD/ibus.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index dfbec51877..bcf29dedd1 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from platforms.pro. - if(ANDROID) add_subdirectory(android) endif() diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index c3deff182e..f352d5d2ac 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -1,17 +1,15 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from android.pro. - ##################################################################### ## QAndroidIntegrationPlugin Plugin: ##################################################################### -qt_find_package(EGL) # special case +qt_find_package(EGL) qt_internal_add_plugin(QAndroidIntegrationPlugin OUTPUT_NAME qtforandroid PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android SOURCES androidcontentfileengine.cpp androidcontentfileengine.h androiddeadlockprotector.h @@ -57,12 +55,9 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::GuiPrivate android jnigraphics - EGL::EGL # special case + EGL::EGL ) -#### Keys ignored in scope 1:.:.:android.pro:<TRUE>: -# OTHER_FILES = "$$PWD/android.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index cc4722cb3e..af8434daaa 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -1,17 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from cocoa.pro. - -# special case: - ##################################################################### ## QCocoaIntegrationPlugin Plugin: ##################################################################### qt_internal_add_plugin(QCocoaIntegrationPlugin OUTPUT_NAME qcocoa - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa PLUGIN_TYPE platforms SOURCES main.mm @@ -66,9 +62,7 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::GuiPrivate ) -# special case begin qt_disable_apple_app_extension_api_only(QCocoaIntegrationPlugin) -# special case end # Resources: set(qcocoaresources_resource_files @@ -84,10 +78,6 @@ qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources" ${qcocoaresources_resource_files} ) - -#### Keys ignored in scope 1:.:.:cocoa.pro:<TRUE>: -# OTHER_FILES = "cocoa.json" - ## Scopes: ##################################################################### @@ -111,8 +101,3 @@ qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionma SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) - -#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: -# QT_FOR_CONFIG = "widgets" -#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt index d0ab0d1efd..70774efa4e 100644 --- a/src/plugins/platforms/direct2d/CMakeLists.txt +++ b/src/plugins/platforms/direct2d/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from direct2d.pro. - ##################################################################### ## QWindowsDirect2DIntegrationPlugin Plugin: ##################################################################### @@ -58,10 +56,10 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin Qt::Gui Qt::GuiPrivate advapi32 - d2d1 # special case + d2d1 d3d11 dwmapi - dwrite # special case + dwrite dxgi dxguid gdi32 @@ -96,15 +94,9 @@ qt_internal_add_resource(QWindowsDirect2DIntegrationPlugin "openglblacklists" ${openglblacklists_resource_files} ) -#### Keys ignored in scope 1:.:.:direct2d.pro:<TRUE>: -# OTHER_FILES = "direct2d.json" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:direct2d.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" - qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl LIBRARIES opengl32 @@ -217,8 +209,6 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND uuid ) -# begin special case if (MINGW) set_source_files_properties(../windows/qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) endif() -# end special case diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index f8cfbdef30..7222168a37 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -1,12 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from directfb.pro. - -# begin special case: qt_find_package(DirectFB) qt_find_package(EGL) -# end special case: ##################################################################### ## QDirectFbIntegrationPlugin Plugin: @@ -28,16 +24,13 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin qdirectfbwindow.cpp qdirectfbwindow.h LIBRARIES PkgConfig::DirectFB - EGL::EGL # special case + EGL::EGL Qt::Core Qt::CorePrivate Qt::Gui Qt::GuiPrivate ) -#### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>: -# OTHER_FILES = "directfb.json" - ## Scopes: ##################################################################### @@ -53,13 +46,7 @@ qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLAT DIRECTFB_PLATFORM_HOOKS ) -#### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: -# QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" - qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) - -#### Keys ignored in scope 5:.:.:directfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 108900518c..cebb0fe66e 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs.pro. -# special case begin qt_find_package(EGL) if(QT_FEATURE_eglfs_gbm) @@ -18,7 +16,6 @@ elseif(QT_FEATURE_eglfs_openwfd) endif() set(QT_QPA_DEFAULT_EGLFS_INTEGRATION "${_device_integration}" CACHE STRING "Default EGLFS device integration plugin") -# special case end ##################################################################### ## EglFSDeviceIntegrationPrivate Module: @@ -37,7 +34,7 @@ qt_internal_add_module(EglFSDeviceIntegrationPrivate DEFINES QT_BUILD_EGL_DEVICE_LIB QT_EGL_NO_X11 - EGLFS_PREFERRED_PLUGIN=${QT_QPA_DEFAULT_EGLFS_INTEGRATION} # special case + EGLFS_PREFERRED_PLUGIN=${QT_QPA_DEFAULT_EGLFS_INTEGRATION} INCLUDE_DIRECTORIES api PUBLIC_LIBRARIES @@ -45,14 +42,11 @@ qt_internal_add_module(EglFSDeviceIntegrationPrivate Qt::DeviceDiscoverySupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate - EGL::EGL # special case + EGL::EGL HEADER_SYNC_SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api" ) -#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>: -# MODULE = "eglfsdeviceintegration" - ## Scopes: ##################################################################### @@ -74,19 +68,6 @@ qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION QT_FEATURE_ope Qt::OpenGLPrivate ) -# special case begin -# comment out -#qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY - #DEFINES - #EGLFS_PLATFORM_HOOKS -#) - -#qt_internal_extend_target(EglFSDeviceIntegrationPrivate CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY - #DEFINES - #EGLFS_PREFERRED_PLUGIN= -#) -# special case end - if(QT_FEATURE_cursor) # Resources: set(cursor_resource_files @@ -109,23 +90,15 @@ endif() qt_internal_add_plugin(QEglFSIntegrationPlugin OUTPUT_NAME qeglfs PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs SOURCES qeglfsmain.cpp DEFINES QT_EGL_NO_X11 LIBRARIES - Qt::CorePrivate # special case + Qt::CorePrivate Qt::EglFSDeviceIntegrationPrivate - EGL::EGL # special case + EGL::EGL ) -#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs.json" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) diff --git a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt index 7637d373a2..d6db171637 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from deviceintegration.pro. - if(QT_FEATURE_eglfs_x11) add_subdirectory(eglfs_x11) endif() diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index e6eaeedd14..fa744be033 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_emu.pro. - ##################################################################### ## QEglFSEmulatorIntegrationPlugin Plugin: ##################################################################### @@ -25,7 +23,3 @@ qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:eglfs_emu.pro:<TRUE>: -# DISTFILES = "eglfs_emu.json" -# OTHER_FILES = "$$PWD/eglfs_emu.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 939ed6b108..d575ae9d4f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_kms.pro. - ##################################################################### ## EglFsKmsGbmSupportPrivate Module: ##################################################################### @@ -48,6 +46,3 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin Qt::KmsSupportPrivate gbm::gbm ) - -#### Keys ignored in scope 3:.:.:eglfs_kms-plugin.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_kms.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index 9fdd7d36fb..3c3e5a8a6c 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_kms_egldevice.pro. - ##################################################################### ## QEglFSKmsEglDeviceIntegrationPlugin Plugin: ##################################################################### @@ -27,6 +25,3 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin Qt::GuiPrivate Qt::KmsSupportPrivate ) - -#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 02c62041ff..bffacb822e 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_kms_support.pro. - ##################################################################### ## EglFsKmsSupportPrivate Module: ##################################################################### diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt index ebd20d2e7b..38981f87b9 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_mali.pro. - ##################################################################### ## QEglFSMaliIntegrationPlugin Plugin: ##################################################################### @@ -24,6 +22,3 @@ qt_internal_add_plugin(QEglFSMaliIntegrationPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:eglfs_mali.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_mali.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt index 068317d63d..7e2362e627 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from openwfd.pro. - ##################################################################### ## QEglFSOpenWFDIntegrationPlugin Plugin: ##################################################################### @@ -22,6 +20,3 @@ qt_internal_add_plugin(QEglFSOpenWFDIntegrationPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:openwfd.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_openwfd.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt index 7d61eec257..01defc9242 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_viv.pro. - ##################################################################### ## QEglFSVivIntegrationPlugin Plugin: ##################################################################### @@ -25,6 +23,3 @@ qt_internal_add_plugin(QEglFSVivIntegrationPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:eglfs_viv.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_viv.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt index 4bd22f6851..6052e98ab8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_viv_wl.pro. - ##################################################################### ## QEglFSVivWaylandIntegrationPlugin Plugin: ##################################################################### @@ -26,6 +24,3 @@ qt_internal_add_plugin(QEglFSVivWaylandIntegrationPlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:eglfs_viv_wl.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_viv_wl.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index c0447938bb..21699aab27 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from eglfs_x11.pro. - ##################################################################### ## QEglFSX11IntegrationPlugin Plugin: ##################################################################### @@ -27,6 +25,3 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin X11::XCB XCB::XCB ) - -#### Keys ignored in scope 1:.:.:eglfs_x11.pro:<TRUE>: -# OTHER_FILES = "$$PWD/eglfs_x11.json" diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index bb6173e3dc..e0473b3ce4 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from ios.pro. - ##################################################################### ## QIOSIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QIOSIntegrationPlugin OUTPUT_NAME qios STATIC # Force static, even in shared builds - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES ios # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES ios PLUGIN_TYPE platforms SOURCES plugin.mm @@ -41,11 +39,7 @@ qt_internal_add_plugin(QIOSIntegrationPlugin Qt::GuiPrivate ) -# special case begin qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin) -# special case end -#### Keys ignored in scope 2:.:.:kernel.pro:<TRUE>: -# OTHER_FILES = "quiview_textinput.mm" "quiview_accessibility.mm" ## Scopes: ##################################################################### @@ -73,6 +67,4 @@ qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS ${FWUniformTypeIdentifiers} ) -#### Keys ignored in scope 6:.:.:kernel.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" add_subdirectory(optional) diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt index 4820ac3b12..a01d7a6441 100644 --- a/src/plugins/platforms/ios/optional/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from optional.pro. - if(IOS) add_subdirectory(nsphotolibrarysupport) endif() diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt index ab1e5b6c4a..663878bde7 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from nsphotolibrarysupport.pro. - ##################################################################### ## QIosOptionalPlugin_NSPhotoLibrary Plugin: ##################################################################### @@ -27,17 +25,7 @@ qt_internal_add_plugin(QIosOptionalPlugin_NSPhotoLibraryPlugin Qt::GuiPrivate ) -# special case begin set_target_properties(QIosOptionalPlugin_NSPhotoLibraryPlugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON ) -# special case end - - -#### Keys ignored in scope 1:.:.:nsphotolibrarysupport.pro:<TRUE>: -# OTHER_FILES = "plugin.json" -# PLUGIN_EXTENDS = "-" - -## Scopes: -##################################################################### diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index 7f950c1957..9f75f53828 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linuxfb.pro. - ##################################################################### ## QLinuxFbIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin OUTPUT_NAME qlinuxfb PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb SOURCES main.cpp qlinuxfbintegration.cpp qlinuxfbintegration.h @@ -25,9 +23,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::GuiPrivate ) -#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>: -# OTHER_FILES = "linuxfb.json" - ## Scopes: ##################################################################### @@ -42,6 +37,3 @@ qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupp LIBRARIES Qt::KmsSupportPrivate ) - -#### Keys ignored in scope 4:.:.:linuxfb.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 21377fb466..f3683deccf 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -1,18 +1,16 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from minimal.pro. - ##################################################################### ## QMinimalIntegrationPlugin Plugin: ##################################################################### -qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) # special case +qt_find_package(WrapFreetype PROVIDED_TARGETS WrapFreetype::WrapFreetype) qt_internal_add_plugin(QMinimalIntegrationPlugin OUTPUT_NAME qminimal PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal SOURCES main.cpp qminimalbackingstore.cpp qminimalbackingstore.h @@ -26,9 +24,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin Qt::GuiPrivate ) -#### Keys ignored in scope 1:.:.:minimal.pro:<TRUE>: -# OTHER_FILES = "minimal.json" - ## Scopes: ##################################################################### @@ -36,6 +31,3 @@ qt_internal_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetyp LIBRARIES WrapFreetype::WrapFreetype ) - -#### Keys ignored in scope 3:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 6b892e6483..a6ec8be781 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from minimalegl.pro. -qt_find_package(EGL) # special case +qt_find_package(EGL) ##################################################################### ## QMinimalEglIntegrationPlugin Plugin: @@ -11,7 +10,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QMinimalEglIntegrationPlugin OUTPUT_NAME qminimalegl PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl SOURCES main.cpp qminimaleglintegration.cpp qminimaleglintegration.h @@ -24,12 +23,9 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - EGL::EGL # special case + EGL::EGL ) -#### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>: -# OTHER_FILES = "minimalegl.json" - ## Scopes: ##################################################################### @@ -39,6 +35,3 @@ qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_open LIBRARIES Qt::OpenGL ) - -#### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index cb911638c0..09ad9a384d 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from offscreen.pro. - ##################################################################### ## QOffscreenIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin OUTPUT_NAME qoffscreen PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen SOURCES main.cpp qoffscreencommon.cpp qoffscreencommon.h @@ -25,9 +23,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin Qt::GuiPrivate ) -#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>: -# OTHER_FILES = "offscreen.json" - ## Scopes: ##################################################################### @@ -37,6 +32,3 @@ qt_internal_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_openg LIBRARIES X11::X11 ) - -#### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/qnx/CMakeLists.txt b/src/plugins/platforms/qnx/CMakeLists.txt index 2b16f86789..3dfd006382 100644 --- a/src/plugins/platforms/qnx/CMakeLists.txt +++ b/src/plugins/platforms/qnx/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qnx.pro. - ##################################################################### ## QQnxIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QQnxIntegrationPlugin OUTPUT_NAME qqnx PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES qnx # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES qnx SOURCES main.cpp main.h qqnxabstractcover.h @@ -41,9 +39,6 @@ qt_internal_add_plugin(QQnxIntegrationPlugin screen ) -#### Keys ignored in scope 1:.:.:qnx.pro:<TRUE>: -# OTHER_FILES = "qnx.json" - ## Scopes: ##################################################################### @@ -90,6 +85,3 @@ qt_internal_extend_target(QQnxIntegrationPlugin CONDITION lgmon LIBRARIES lgmon ) - -#### Keys ignored in scope 8:.:.:qnx.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index e64e6b9c70..25cb399bd0 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from vnc.pro. - ##################################################################### ## QVncIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin OUTPUT_NAME qvnc PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc SOURCES main.cpp qvnc.cpp qvnc_p.h @@ -28,9 +26,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin Qt::Network ) -#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>: -# OTHER_FILES = "vnc.json" - ## Scopes: ##################################################################### @@ -38,6 +33,3 @@ qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSuppor LIBRARIES Qt::InputSupportPrivate ) - -#### Keys ignored in scope 3:.:.:vnc.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt index 6482de310c..d7c96afdaa 100644 --- a/src/plugins/platforms/wasm/CMakeLists.txt +++ b/src/plugins/platforms/wasm/CMakeLists.txt @@ -1,15 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from wasm.pro. - ##################################################################### ## QWasmIntegrationPlugin Plugin: ##################################################################### qt_internal_add_plugin(QWasmIntegrationPlugin OUTPUT_NAME qwasm - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wasm # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES wasm PLUGIN_TYPE platforms STATIC SOURCES @@ -71,7 +69,6 @@ qt_internal_extend_target(QWasmIntegrationPlugin CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -#### Keys ignored in scope 4:.:.:wasm.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" set(wasm_support_files diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 7884fc164e..33ccbf6a0a 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from windows.pro. - ##################################################################### ## QWindowsIntegrationPlugin Plugin: ##################################################################### @@ -10,7 +8,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin OUTPUT_NAME qwindows PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows SOURCES main.cpp qtwindowsglobal.h @@ -83,10 +81,6 @@ qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists" ${openglblacklists_resource_files} ) - -#### Keys ignored in scope 1:.:.:windows.pro:<TRUE>: -# OTHER_FILES = "windows.json" - ## Scopes: ##################################################################### @@ -98,9 +92,6 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -#### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" - qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl LIBRARIES opengl32 @@ -205,8 +196,6 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATU uuid ) -# begin special case if (MINGW) set_source_files_properties(qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON) endif() -# end special case diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 7fe0e8177c..3303f19487 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from xcb.pro. - ##################################################################### ## XcbQpaPrivate Module: ##################################################################### @@ -64,9 +62,7 @@ qt_internal_add_module(XcbQpaPrivate XKB::XKB ) -# special case begin qt_disable_apple_app_extension_api_only(XcbQpaPrivate) -# special case end ## Scopes: ##################################################################### @@ -91,12 +87,7 @@ qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_xcb_xlib qt_xlib_wrapper.c qt_xlib_wrapper.h PUBLIC_LIBRARIES X11::XCB - # special case begin - # 'QMAKE_USE += xcb_xlib' in qmake implies also += xlib (aka X11) - # due to "use": "xcb xlib" in src/gui/configure.json. - # That's not yet handled by the conversion scripts unfortunately. X11::X11 - # special case end ) qt_internal_extend_target(XcbQpaPrivate CONDITION NOT QT_FEATURE_xcb_xlib @@ -152,7 +143,6 @@ qt_internal_extend_target(XcbQpaPrivate CONDITION QT_FEATURE_fontconfig AND QT_F WrapFreetype::WrapFreetype ) -# special case begin if(QT_FEATURE_system_xcb_xinput) qt_internal_extend_target(XcbQpaPrivate LIBRARIES XCB::XINPUT) else() @@ -166,7 +156,6 @@ else() "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/include" ) endif() -# special case end ##################################################################### ## QXcbIntegrationPlugin Plugin: @@ -175,7 +164,7 @@ endif() qt_internal_add_plugin(QXcbIntegrationPlugin OUTPUT_NAME qxcb PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb SOURCES qxcbmain.cpp DEFINES @@ -186,16 +175,7 @@ qt_internal_add_plugin(QXcbIntegrationPlugin Qt::XcbQpaPrivate ) -#### Keys ignored in scope 18:.:.:xcb-plugin.pro:<TRUE>: -# OTHER_FILES = "xcb.json" "README" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 20:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" add_subdirectory(gl_integrations) if(OFF) add_subdirectory(xcb-static) # special case TODO: xcb-static sub folder endif() - diff --git a/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt index dcc5912f7c..957beb9ed4 100644 --- a/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from gl_integrations.pro. - if(QT_FEATURE_xcb_egl_plugin) add_subdirectory(xcb_egl) endif() diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt index a358ff788d..c67ccd1cb1 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -1,13 +1,11 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from xcb_egl.pro. - ##################################################################### ## QXcbEglIntegrationPlugin Plugin: ##################################################################### -qt_find_package(EGL) # special case +qt_find_package(EGL) qt_internal_add_plugin(QXcbEglIntegrationPlugin OUTPUT_NAME qxcb-egl-integration @@ -29,5 +27,5 @@ qt_internal_add_plugin(QXcbEglIntegrationPlugin Qt::Gui Qt::GuiPrivate Qt::XcbQpaPrivate - EGL::EGL # special case + EGL::EGL ) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 24a5e31063..13787eb9e7 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from xcb_glx.pro. - ##################################################################### ## QXcbGlxIntegrationPlugin Plugin: ##################################################################### diff --git a/src/plugins/platformthemes/CMakeLists.txt b/src/plugins/platformthemes/CMakeLists.txt index be4adc196b..e5abcd1a11 100644 --- a/src/plugins/platformthemes/CMakeLists.txt +++ b/src/plugins/platformthemes/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from platformthemes.pro. if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression AND UNIX AND NOT APPLE) add_subdirectory(xdgdesktopportal) diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index 2ce2971e91..89acc84f07 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -1,12 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from gtk3.pro. - -qt_find_package(GTK3) # special case +qt_find_package(GTK3) if(QT_FEATURE_xlib) - qt_find_package(X11) # special case + qt_find_package(X11) endif() ##################################################################### @@ -27,7 +25,7 @@ qt_internal_add_plugin(QGtk3ThemePlugin qgtk3json.cpp qgtk3json_p.h DEFINES GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6 - LIBRARIES # special case + LIBRARIES PkgConfig::GTK3 Qt::Core Qt::CorePrivate @@ -37,8 +35,5 @@ qt_internal_add_plugin(QGtk3ThemePlugin qt_internal_extend_target(QGtk3ThemePlugin CONDITION QT_FEATURE_xlib LIBRARIES - X11::X11 # special case + X11::X11 ) - -#### Keys ignored in scope 1:.:.:gtk3.pro:<TRUE>: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index f3c76ff7d1..6228e83ec7 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from xdgdesktopportal.pro. - ##################################################################### ## QXdgDesktopPortalThemePlugin Plugin: ##################################################################### @@ -22,6 +20,3 @@ qt_internal_add_plugin(QXdgDesktopPortalThemePlugin Qt::Gui Qt::GuiPrivate ) - -#### Keys ignored in scope 1:.:.:xdgdesktopportal.pro:<TRUE>: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt index 05605f5a8b..7736684762 100644 --- a/src/plugins/printsupport/CMakeLists.txt +++ b/src/plugins/printsupport/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from printsupport.pro. - if(QT_FEATURE_cups AND UNIX AND NOT APPLE) add_subdirectory(cups) endif() diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index 233587c96e..b6400d2d36 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from cups.pro. - -qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case +qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) ##################################################################### ## QCupsPrinterSupportPlugin Plugin: @@ -28,7 +26,3 @@ qt_internal_add_plugin(QCupsPrinterSupportPlugin Qt::PrintSupport Qt::PrintSupportPrivate ) - -#### Keys ignored in scope 1:.:.:cups.pro:<TRUE>: -# MODULE = "cupsprintersupport" -# OTHER_FILES = "cups.json" diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt index 932e501c48..40f8b168ba 100644 --- a/src/plugins/sqldrivers/CMakeLists.txt +++ b/src/plugins/sqldrivers/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sqldrivers.pro. - -# special case begin cmake_minimum_required(VERSION 3.16) if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt") include(.cmake.conf) @@ -70,4 +67,3 @@ endif() if(NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt") qt_print_feature_summary() endif() -# special case end diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 4f5680799f..119a5b53c9 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from db2.pro. - ##################################################################### ## QDB2DriverPlugin Plugin: ##################################################################### @@ -23,9 +21,6 @@ qt_internal_add_plugin(QDB2DriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:db2.pro:<TRUE>: -# OTHER_FILES = "db2.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 4a65847be7..fb28abd91a 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from mysql.pro. - ##################################################################### ## QMYSQLDriverPlugin Plugin: ##################################################################### @@ -23,7 +21,4 @@ qt_internal_add_plugin(QMYSQLDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>: -# OTHER_FILES = "mysql.json" - qt_internal_force_macos_intel_arch(QMYSQLDriverPlugin) diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index eb0597e434..66c4219905 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from oci.pro. - ##################################################################### ## QOCIDriverPlugin Plugin: ##################################################################### @@ -23,9 +21,6 @@ qt_internal_add_plugin(QOCIDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:oci.pro:<TRUE>: -# OTHER_FILES = "oci.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 2b56a4fca6..df091f9687 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -1,13 +1,11 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from odbc.pro. - ##################################################################### ## QODBCDriverPlugin Plugin: ##################################################################### -qt_find_package(ODBC) # special case +qt_find_package(ODBC) qt_internal_add_plugin(QODBCDriverPlugin OUTPUT_NAME qsqlodbc @@ -25,9 +23,6 @@ qt_internal_add_plugin(QODBCDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:odbc.pro:<TRUE>: -# OTHER_FILES = "odbc.json" - ## Scopes: ##################################################################### diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 269fe3367d..d392f4dfa5 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from psql.pro. - -qt_find_package(PostgreSQL) # special case +qt_find_package(PostgreSQL) ##################################################################### ## QPSQLDriverPlugin Plugin: @@ -25,9 +23,6 @@ qt_internal_add_plugin(QPSQLDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:psql.pro:<TRUE>: -# OTHER_FILES = "psql.json" - # PostgreSQL delivers header files that are not a part of PostgreSQL itself. When precompiled # headers are processed, MinGW uses 'pthread.h' from the PostgreSQL installation directory. # As result, we disable precompile headers for the plugin. diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index a183ecc965..add9dff9fd 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sqlite.pro. - ##################################################################### ## QSQLiteDriverPlugin Plugin: ##################################################################### @@ -22,10 +20,6 @@ qt_internal_add_plugin(QSQLiteDriverPlugin Qt::SqlPrivate ) -#### Keys ignored in scope 1:.:.:sqlite.pro:<TRUE>: -# OTHER_FILES = "sqlite.json" -# QT_FOR_CONFIG = "sqldrivers-private" - ## Scopes: ##################################################################### @@ -34,7 +28,6 @@ qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite SQLite::SQLite3 ) -# special case begin if (NOT QT_FEATURE_system_sqlite) # On newer compilers compiling sqlite.c produces warnings qt_disable_warnings(QSQLiteDriverPlugin) @@ -43,7 +36,6 @@ endif() if(QT_FEATURE_system_sqlite) qt_internal_force_macos_intel_arch(QSQLiteDriverPlugin) endif() -# special case end qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES diff --git a/src/plugins/styles/CMakeLists.txt b/src/plugins/styles/CMakeLists.txt index db7790ae4e..a16c7c4c9a 100644 --- a/src/plugins/styles/CMakeLists.txt +++ b/src/plugins/styles/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from styles.pro. - if(QT_FEATURE_style_android) add_subdirectory(android) endif() diff --git a/src/plugins/styles/android/CMakeLists.txt b/src/plugins/styles/android/CMakeLists.txt index fc4e6190b8..b8bda6fd5f 100644 --- a/src/plugins/styles/android/CMakeLists.txt +++ b/src/plugins/styles/android/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from android.pro. - ##################################################################### ## QAndroidStylePlugin Plugin: ##################################################################### @@ -18,6 +16,3 @@ qt_internal_add_plugin(QAndroidStylePlugin Qt::Gui Qt::WidgetsPrivate ) - -#### Keys ignored in scope 1:.:.:android.pro:<TRUE>: -# DISTFILES = "androidstyle.json" diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index 2f3184855c..9dc8d01cc7 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from mac.pro. - ##################################################################### ## QMacStylePlugin Plugin: ##################################################################### @@ -21,12 +19,7 @@ qt_internal_add_plugin(QMacStylePlugin Qt::WidgetsPrivate ) -#### Keys ignored in scope 1:.:.:mac.pro:<TRUE>: -# DISTFILES = "macstyle.json" - -# special case begin set_target_properties(QMacStylePlugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON ) -# special case end diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt index ab87ad4186..372a944638 100644 --- a/src/plugins/styles/windowsvista/CMakeLists.txt +++ b/src/plugins/styles/windowsvista/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from windowsvista.pro. - ##################################################################### ## QWindowsVistaStylePlugin Plugin: ##################################################################### @@ -25,6 +23,3 @@ qt_internal_add_plugin(QWindowsVistaStylePlugin Qt::Gui Qt::WidgetsPrivate ) - -#### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>: -# DISTFILES = "windowsvistastyle.json" diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index a11c5d553b..83ab9cddeb 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from printsupport.pro. - ##################################################################### ## PrintSupport Module: ##################################################################### @@ -44,9 +42,6 @@ qt_internal_add_module(PrintSupport "(^|/)qplatform.+\\.h$" ) -#### Keys ignored in scope 1:.:.:printsupport.pro:<TRUE>: -# QMAKE_LIBS = "$$QMAKE_LIBS_PRINTSUPPORT" - ## Scopes: ##################################################################### diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index a6c0f3452f..a7e139655a 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sql.pro. - ##################################################################### ## Sql Module: ##################################################################### @@ -40,9 +38,6 @@ qt_internal_add_module(Sql GENERATE_CPP_EXPORTS ) -#### Keys ignored in scope 1:.:.:sql.pro:<TRUE>: -# SQL_P = "sql" - ## Scopes: ##################################################################### diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index fa967ca43c..6cdb8f3376 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -1,11 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from testlib.pro. - -# special case begin include(selfcover.cmake) -# special case end ##################################################################### ## Test Module: @@ -77,15 +73,9 @@ qt_internal_add_module(Test GENERATE_PRIVATE_CPP_EXPORTS ) -#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: -# MODULE_CONFIG = "console" "testlib_defines" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: -# QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" - qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h @@ -135,30 +125,11 @@ set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>" ) -# special case begin -# Do not bother with disabled stuff: -# qt_internal_extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... -# qt_internal_extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... -# special case end - -#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: -# MODULE_CONFIG = "xctest" - -#### Keys ignored in scope 10:.:.:testlib.pro:NOT TARGET Qt::Gui: -# HEADERSCLEAN_EXCLUDE = "qtest_gui.h" "qtestaccessible.h" "qtestkeyboard.h" "qtestmouse.h" "qtesttouch.h" - -#### Keys ignored in scope 11:.:.:testlib.pro:NOT TARGET Qt::Widgets: -# HEADERSCLEAN_EXCLUDE = "qtest_widgets.h" - -#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: -# HEADERSCLEAN_EXCLUDE = "qtest_network.h" qt_internal_add_docs(Test doc/qttestlib.qdocconf ) -# special case begin qt_internal_apply_testlib_coverage_options(Test) -# special case end # include the snippet projects for developer-builds if(QT_FEATURE_private_tests) diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index b53e541fd0..2a0f1ae9af 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from androiddeployqt.pro. - ##################################################################### ## androiddeployqt App: ##################################################################### @@ -20,7 +18,7 @@ qt_internal_add_tool(${target_name} QT_NO_CAST_TO_ASCII QT_NO_FOREACH LIBRARIES - Qt::Core # special case + Qt::Core INCLUDE_DIRECTORIES ../shared ) @@ -29,9 +27,6 @@ set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) -#### Keys ignored in scope 1:.:.:androiddeployqt.pro:<TRUE>: -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index c3c6ee476c..77157e29a3 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from androidtestrunner.pro. - ##################################################################### ## androidtestrunner App: ##################################################################### @@ -27,9 +25,6 @@ set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) -#### Keys ignored in scope 1:.:.:androidtestrunner.pro:<TRUE>: -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 87c5edd90e..232b6fcdfe 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -1,20 +1,16 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from bootstrap.pro. - ##################################################################### ## Bootstrap Module: ##################################################################### -# special case begin # The bootstrap library has a few manual tweaks compared to other # libraries. qt_add_library(Bootstrap STATIC) qt_internal_add_sync_header_dependencies(Bootstrap Core) -# special case end qt_internal_extend_target(Bootstrap SOURCES ../../corelib/global/qassert.cpp @@ -94,12 +90,12 @@ qt_internal_extend_target(Bootstrap DEFINES HAVE_CONFIG_H QT_TYPESAFE_FLAGS - PUBLIC_DEFINES # special case - QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case - QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case - QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case - QT_VERSION_STR="${PROJECT_VERSION}" # special case - QT_USE_QSTRINGBUILDER # special case + PUBLIC_DEFINES + QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} + QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} + QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} + QT_VERSION_STR="${PROJECT_VERSION}" + QT_USE_QSTRINGBUILDER QT_BOOTSTRAPPED QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII @@ -107,20 +103,13 @@ qt_internal_extend_target(Bootstrap INCLUDE_DIRECTORIES .. ../../3rdparty/tinycbor/src - PUBLIC_INCLUDE_DIRECTORIES # special case - $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case + PUBLIC_INCLUDE_DIRECTORIES + $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> ../../corelib/global - PUBLIC_LIBRARIES # special case - Qt::Platform # special case + PUBLIC_LIBRARIES + Qt::Platform ) -#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>: -# INSTALLS = "lib" -# MODULE_CONFIG = "gc_binaries" -# MODULE_INCNAME = "QtCore" "QtXml" -# _OPTION = "host_build" -# lib.CONFIG = "dummy_install" - ## Scopes: ##################################################################### @@ -216,7 +205,7 @@ qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEA DEFINES PCRE2_CODE_UNIT_WIDTH=16 PCRE2_DISABLE_JIT - PUBLIC_INCLUDE_DIRECTORIES # special case + PUBLIC_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/pcre2/src> ) @@ -235,10 +224,6 @@ qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 uuid ) -#### Keys ignored in scope 22:.:../../3rdparty/pcre2:../../3rdparty/pcre2/pcre2.pri:QT_FEATURE_intelcet: -# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" - -# special case begin target_link_libraries(Bootstrap PRIVATE PlatformCommonInternal) qt_internal_apply_gc_binaries(Bootstrap PUBLIC) set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF) @@ -259,4 +244,3 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0" AND QT_FEATURE_debug_and_release set_property(TARGET Bootstrap PROPERTY EXCLUDE_FROM_ALL "$<NOT:$<CONFIG:${QT_MULTI_CONFIG_FIRST_CONFIG}>>") endif() -# special case end diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index 3b049cd797..5822568877 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -9,7 +9,7 @@ qt_get_tool_target_name(target_name cmake_automoc_parser) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES main.cpp DEFINES diff --git a/src/tools/macdeployqt/CMakeLists.txt b/src/tools/macdeployqt/CMakeLists.txt index 3054926cd3..2e01ec90b4 100644 --- a/src/tools/macdeployqt/CMakeLists.txt +++ b/src/tools/macdeployqt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from macdeployqt.pro. - if(NOT QT_FEATURE_macdeployqt) return() endif() diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index c074abaffe..4302992bad 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from moc.pro. - ##################################################################### ## moc Tool: ##################################################################### @@ -12,7 +10,7 @@ qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap TARGET_DESCRIPTION "Qt Meta Object Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES cbordevice.h collectjson.cpp collectjson.h @@ -38,10 +36,6 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:moc.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index deaea21a1f..59677288c7 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbuscpp2xml.pro. - ##################################################################### ## qdbuscpp2xml Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qdbuscpp2xml) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" - TOOLS_TARGET DBus # special case + TOOLS_TARGET DBus SOURCES ../moc/cbordevice.h ../moc/collectjson.cpp ../moc/collectjson.h @@ -32,22 +30,5 @@ qt_internal_add_tool(${target_name} LIBRARIES Qt::CorePrivate Qt::DBusPrivate - # COMPILE_OPTIONS # special case - # "$$QT_HOST_CFLAGS_DBUS" - # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler" - # _LOADED = "qt_tool" - # _OPTION = "host_build" ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### - -# special case begin -# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) -# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) -# special case end diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index b79c8002e8..05acd0329c 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbusxml2cpp.pro. - ##################################################################### ## qdbusxml2cpp Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qdbusxml2cpp) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" - TOOLS_TARGET DBus # special case + TOOLS_TARGET DBus SOURCES qdbusxml2cpp.cpp DEFINES @@ -19,23 +17,5 @@ qt_internal_add_tool(${target_name} LIBRARIES Qt::CorePrivate Qt::DBusPrivate - # COMPILE_OPTIONS # special case - # "$$QT_HOST_CFLAGS_DBUS" - # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler" - # _LOADED = "qt_tool" - # _OPTION = "host_build" ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### - -# special case begin -# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) -# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) -# qt_internal_extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) -# special case end diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index 6d118c560a..003b46417a 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qlalr.pro. - ##################################################################### ## qlalr Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name qlalr) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES compress.cpp compress.h cppgenerator.cpp cppgenerator.h @@ -24,11 +22,6 @@ qt_internal_add_tool(${target_name} DEFINES QT_NO_FOREACH LIBRARIES - Qt::Core # special case + Qt::Core ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qlalr.pro:<TRUE>: -# OTHER_FILES = "lalr.g" -# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator" -# _OPTION = "host_build" diff --git a/src/tools/qtpaths/CMakeLists.txt b/src/tools/qtpaths/CMakeLists.txt index 90613b17d0..eef33c588d 100644 --- a/src/tools/qtpaths/CMakeLists.txt +++ b/src/tools/qtpaths/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtpaths.pro. - ##################################################################### ## qtpaths App: ##################################################################### diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index d694766a7f..0f68968fd3 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qvkgen.pro. - ##################################################################### ## qvkgen Tool: ##################################################################### @@ -11,14 +9,10 @@ qt_get_tool_target_name(target_name qvkgen) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Gui # special case + TOOLS_TARGET Gui SOURCES qvkgen.cpp LIBRARIES - Qt::Core # special case + Qt::Core ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qvkgen.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator" -# _OPTION = "host_build" diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 64eb0b33f5..c810537721 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from rcc.pro. - ##################################################################### ## rcc Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name rcc) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Resource Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES main.cpp rcc.cpp rcc.h @@ -24,10 +22,6 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:rcc.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler" -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index 5acf781bf9..2bcdfe42b0 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tracegen.pro. - ##################################################################### ## tracegen Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name tracegen) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES etw.cpp etw.h helpers.cpp helpers.h @@ -23,6 +21,3 @@ qt_internal_add_tool(${target_name} tracegen.cpp ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:tracegen.pro:<TRUE>: -# _OPTION = "host_build" diff --git a/src/tools/tracepointgen/CMakeLists.txt b/src/tools/tracepointgen/CMakeLists.txt index 17bdcc316b..2f473d376a 100644 --- a/src/tools/tracepointgen/CMakeLists.txt +++ b/src/tools/tracepointgen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tracegen.pro. - ##################################################################### ## tracepointgen Tool: ##################################################################### @@ -11,12 +9,9 @@ qt_get_tool_target_name(target_name tracepointgen) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES tracepointgen.cpp tracepointgen.h parser.cpp parser.h ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:tracegen.pro:<TRUE>: -# _OPTION = "host_build" diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index fcdfa60939..9f9ea93bea 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from uic.pro. - ##################################################################### ## uic Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name uic) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Widgets # special case + TOOLS_TARGET Widgets SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h @@ -40,14 +38,5 @@ qt_internal_add_tool(${target_name} cpp python shared - #PUBLIC_LIBRARIES # special case remove - #Qt::Gui # special case remove ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:uic.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 3babfad76b..ed9086e19a 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from widgets.pro. - ##################################################################### ## Widgets Module: ##################################################################### @@ -306,10 +304,6 @@ if(QT_FEATURE_reduce_relocations AND UNIX AND GCC) "LINKER:--dynamic-list=${CMAKE_CURRENT_LIST_DIR}/QtWidgets.dynlist") endif() -#### Keys ignored in scope 1:.:.:widgets.pro:<TRUE>: -# MODULE_CONFIG = "uic" -# QMAKE_LIBS = "$$QMAKE_LIBS_GUI" - ## Scopes: ##################################################################### diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 982bfb8e54..6c5c0c2755 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from xml.pro. - ##################################################################### ## Xml Module: ##################################################################### |