diff options
60 files changed, 19 insertions, 291 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3f4e4e5e..8ef7bc58c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qttools.pro. cmake_minimum_required(VERSION 3.16) include(.cmake.conf) -project(QtTools # special case +project(QtTools VERSION "${QT_REPO_MODULE_VERSION}" - DESCRIPTION "Qt Tools" # special case + DESCRIPTION "Qt Tools" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) @@ -26,9 +25,5 @@ find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS qt_build_repo() -# special case begin - # Add tool dependencies that were deferred by qt_internal_add_docs. qt_internal_add_deferred_dependencies() - -# special case end diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b62970f7..6356cd7ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,28 +1,21 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from src.pro. - -# special case begin # Need to stop building these apps by default because they would fail # in device_and_simulator and webassembly builds. if(IOS OR WASM) set(_qt_additional_tools_to_exclude qtplugininfo) endif() -# special case end qt_exclude_tool_directories_from_default_target( distancefieldgenerator pixeltool - ${_qt_additional_tools_to_exclude} # special case + ${_qt_additional_tools_to_exclude} ) - -# special case begin # Evaluate features to decide what to build. # The config files will be written in the src/global module. qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/../configure.cmake") -# special case end if(TARGET Qt::Widgets) add_subdirectory(uiplugin) diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt index 0417f749c..5d2bf2b67 100644 --- a/src/assistant/CMakeLists.txt +++ b/src/assistant/CMakeLists.txt @@ -1,13 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from assistant.pro. - -# special case begin if(NOT TARGET Qt::Sql OR NOT TARGET Qt::PrintSupport) return() endif() -# special case end qt_exclude_tool_directories_from_default_target( assistant diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt index 35fafc3cb..10df7f777 100644 --- a/src/assistant/assistant/CMakeLists.txt +++ b/src/assistant/assistant/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from assistant.pro. - ##################################################################### ## assistant App: ##################################################################### @@ -51,7 +49,7 @@ qt_internal_add_app(assistant Qt::Network Qt::Sql Qt::Widgets - Qt::PrintSupport # special case + Qt::PrintSupport qlitehtml ENABLE_AUTOGEN_TOOLS uic @@ -102,18 +100,9 @@ set_target_properties(assistant PROPERTIES QT_TARGET_DESCRIPTION "Qt Assistant" ) -#### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>: -# PROJECTNAME = "Assistant" - ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:.:assistant.pro:TARGET Qt::WebKitWidgets AND NOT QT_CONFIG___contains___static: -# BROWSER = "qtwebkit" - -#### Keys ignored in scope 3:.:.:assistant.pro:else: -# BROWSER = "qtextbrowser" - qt_internal_extend_target(assistant CONDITION TARGET Qt::PrintSupport PUBLIC_LIBRARIES Qt::PrintSupport @@ -178,11 +167,9 @@ if(APPLE) target_sources(assistant PRIVATE assistant.icns ) - # special case end # Set values to be replaced in the custom Info_mac.plist. set(ICON "assistant.icns") set(EXECUTABLE "Assistant") - # special case end endif() qt_internal_add_docs(assistant doc/qtassistant.qdocconf diff --git a/src/assistant/help/CMakeLists.txt b/src/assistant/help/CMakeLists.txt index 07a7725b1..65c7b6f13 100644 --- a/src/assistant/help/CMakeLists.txt +++ b/src/assistant/help/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from help.pro. - ##################################################################### ## Help Module: ##################################################################### diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt index ad9eea1c4..e53106e08 100644 --- a/src/assistant/qhelpgenerator/CMakeLists.txt +++ b/src/assistant/qhelpgenerator/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpgenerator.pro. - ##################################################################### ## qhelpgenerator Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qhelpgenerator) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Compressed Help File Generator" - TOOLS_TARGET Tools # special case + TOOLS_TARGET Tools INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt index 675614e80..b4deaf956 100644 --- a/src/designer/CMakeLists.txt +++ b/src/designer/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from designer.pro. - if(NOT QT_FEATURE_designer) return() endif() diff --git a/src/designer/src/CMakeLists.txt b/src/designer/src/CMakeLists.txt index 8f7de79f7..00d2a48e2 100644 --- a/src/designer/src/CMakeLists.txt +++ b/src/designer/src/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from src.pro. - - qt_exclude_tool_directories_from_default_target( lib components diff --git a/src/designer/src/components/CMakeLists.txt b/src/designer/src/components/CMakeLists.txt index 6985ea4d7..ec6a9a8fd 100644 --- a/src/designer/src/components/CMakeLists.txt +++ b/src/designer/src/components/CMakeLists.txt @@ -1,6 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from components.pro. - add_subdirectory(lib) diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt index e97d8f442..13fc35099 100644 --- a/src/designer/src/components/lib/CMakeLists.txt +++ b/src/designer/src/components/lib/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lib.pro. - ##################################################################### ## DesignerComponentsPrivate Module: ##################################################################### @@ -347,10 +345,6 @@ qt_internal_add_resource(DesignerComponentsPrivate "widgetbox" ${widgetbox_resource_files} ) - -#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>: -# MODULE = "DesignerComponentsPrivate" - ## Scopes: ##################################################################### diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt index bbc47837d..29591e959 100644 --- a/src/designer/src/designer/CMakeLists.txt +++ b/src/designer/src/designer/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from designer.pro. ##################################################################### ## designer App: @@ -136,7 +135,6 @@ if(APPLE) # special case end endif() -#### Keys ignored in scope 6:.:.:designer.pro:APPLE: # FILETYPES.files = "uifile.icns" # FILETYPES.path = "Contents/Resources" # QMAKE_BUNDLE_DATA = "FILETYPES" diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt index fb6936724..7c6d6afb4 100644 --- a/src/designer/src/lib/CMakeLists.txt +++ b/src/designer/src/lib/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lib.pro. ##################################################################### ## Designer Module: @@ -381,8 +380,6 @@ qt_internal_add_resource(Designer "shared" ${shared_resource_files} ) - -#### Keys ignored in scope 1:.:.:lib.pro:<TRUE>: # MODULE = "designer" ## Scopes: diff --git a/src/designer/src/plugins/CMakeLists.txt b/src/designer/src/plugins/CMakeLists.txt index 6cce0c912..35e549c3e 100644 --- a/src/designer/src/plugins/CMakeLists.txt +++ b/src/designer/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::WebKitWidgets) add_subdirectory(qwebview) endif() diff --git a/src/designer/src/plugins/activeqt/CMakeLists.txt b/src/designer/src/plugins/activeqt/CMakeLists.txt index 03578c25c..18b98a885 100644 --- a/src/designer/src/plugins/activeqt/CMakeLists.txt +++ b/src/designer/src/plugins/activeqt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from activeqt.pro. - ##################################################################### ## QAxWidgetPlugin Plugin: ##################################################################### @@ -25,5 +23,4 @@ qt_internal_add_plugin(QAxWidgetPlugin Qt::Widgets ) -#### Keys ignored in scope 1:.:.:activeqt.pro:<TRUE>: # OTHER_FILES = "activeqt.json" diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt index 68f65ea05..1832a4e49 100644 --- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt +++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qquickwidget.pro. - ##################################################################### ## QQuickWidgetPlugin Plugin: ##################################################################### diff --git a/src/designer/src/plugins/qwebview/CMakeLists.txt b/src/designer/src/plugins/qwebview/CMakeLists.txt index e0e87dbf2..f6eeb16e1 100644 --- a/src/designer/src/plugins/qwebview/CMakeLists.txt +++ b/src/designer/src/plugins/qwebview/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qwebview.pro. - ##################################################################### ## QWebViewPlugin Plugin: ##################################################################### @@ -31,7 +29,3 @@ qt_internal_add_resource(QWebViewPlugin "qwebview_plugin" FILES ${qwebview_plugin_resource_files} ) - - -#### Keys ignored in scope 1:.:.:qwebview.pro:<TRUE>: -# OTHER_FILES = "qwebview.json" diff --git a/src/designer/src/plugins/tools/view3d/CMakeLists.txt b/src/designer/src/plugins/tools/view3d/CMakeLists.txt index 9e63218b4..aa6140519 100644 --- a/src/designer/src/plugins/tools/view3d/CMakeLists.txt +++ b/src/designer/src/plugins/tools/view3d/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from view3d.pro. - ##################################################################### ## QView3DPlugin Plugin: ##################################################################### diff --git a/src/distancefieldgenerator/CMakeLists.txt b/src/distancefieldgenerator/CMakeLists.txt index 8de05590d..04edc6eef 100644 --- a/src/distancefieldgenerator/CMakeLists.txt +++ b/src/distancefieldgenerator/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from distancefieldgenerator.pro. - ##################################################################### ## qdistancefieldgenerator App: ##################################################################### @@ -30,9 +28,6 @@ set_target_properties(qdistancefieldgenerator PROPERTIES QT_TARGET_DESCRIPTION "Qt Distance Field Generator" ) -#### Keys ignored in scope 1:.:.:distancefieldgenerator.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(distancefieldgenerator)" qt_internal_add_docs(qdistancefieldgenerator doc/qtdistancefieldgenerator.qdocconf ) diff --git a/src/global/CMakeLists.txt b/src/global/CMakeLists.txt index f344c2049..4be0d49c8 100644 --- a/src/global/CMakeLists.txt +++ b/src/global/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from global.pro. - ##################################################################### ## Tools Module: ##################################################################### @@ -16,6 +14,3 @@ qt_internal_add_module(Tools MODULE_INTERFACE_NAME Tools # Specify the 'Tools' name explicitly to avoid warning # related to the expected name of internal module. ) - -#### Keys ignored in scope 1:.:.:global.pro:<TRUE>: -# MODULE = "tools" diff --git a/src/kmap2qmap/CMakeLists.txt b/src/kmap2qmap/CMakeLists.txt index 0eb7bdad4..040992ce3 100644 --- a/src/kmap2qmap/CMakeLists.txt +++ b/src/kmap2qmap/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from kmap2qmap.pro. - ##################################################################### ## kmap2qmap App: ##################################################################### @@ -16,7 +14,3 @@ qt_internal_add_app(kmap2qmap set_target_properties(kmap2qmap PROPERTIES WIN32_EXECUTABLE FALSE ) - -#### Keys ignored in scope 1:.:.:kmap2qmap.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(kmap2qmap)" diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt index 1e19edbe3..d85254b32 100644 --- a/src/linguist/CMakeLists.txt +++ b/src/linguist/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - - qt_exclude_tool_directories_from_default_target( linguist ) @@ -21,7 +18,5 @@ if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TA add_subdirectory(linguist) endif() -# special case begin # Create a fake module that would emulate the Qt5::LinguistTools CMake Config package qt_internal_add_module(Linguist NO_MODULE_HEADERS HEADER_MODULE) -# special case end diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt index 80ff34087..8f7b03a77 100644 --- a/src/linguist/lconvert/CMakeLists.txt +++ b/src/linguist/lconvert/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lconvert.pro. - ##################################################################### ## lconvert Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lconvert) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Converter" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist SOURCES ../shared/numerus.cpp ../shared/po.cpp @@ -31,7 +29,3 @@ qt_internal_add_tool(${target_name} Qt::CorePrivate ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Converter" -# _OPTION = "host_build" diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt index b5bd8ccfc..edb6e3ae6 100644 --- a/src/linguist/linguist/CMakeLists.txt +++ b/src/linguist/linguist/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - ##################################################################### ## linguist App: ##################################################################### @@ -132,10 +130,8 @@ set_target_properties(linguist PROPERTIES QT_TARGET_DESCRIPTION "Qt Linguist" ) -# special case begin file(GLOB phrasebooks_files "${CMAKE_CURRENT_SOURCE_DIR}/../phrasebooks/*") qt_install(FILES ${phrasebooks_files} DESTINATION "${INSTALL_DATADIR}/phrasebooks") -# special case end qt_internal_extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_ DEFINES diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt index ad4e5fd82..7a7308e54 100644 --- a/src/linguist/lprodump/CMakeLists.txt +++ b/src/linguist/lprodump/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lprodump.pro. - ##################################################################### ## lprodump Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lprodump) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Linguist QMake Project Dump Tool" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/ioutils.cpp ../shared/ioutils.h diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt index ec6af293b..437e26381 100644 --- a/src/linguist/lrelease-pro/CMakeLists.txt +++ b/src/linguist/lrelease-pro/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease-pro.pro. - ##################################################################### ## lrelease-pro Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lrelease-pro) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Compiler for QMake Projects" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/runqttool.cpp ../shared/runqttool.h @@ -22,10 +20,3 @@ qt_internal_add_tool(${target_name} ../shared ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lrelease-pro.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler for QMake Projects" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt index a1f01f840..8d22c2db4 100644 --- a/src/linguist/lrelease/CMakeLists.txt +++ b/src/linguist/lrelease/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease.pro. - ##################################################################### ## lrelease Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lrelease) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Compiler" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist SOURCES ../shared/numerus.cpp ../shared/po.cpp @@ -39,10 +37,3 @@ qt_internal_add_tool(${target_name} # special case end ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt index 0b274b95e..6711d0008 100644 --- a/src/linguist/lupdate-pro/CMakeLists.txt +++ b/src/linguist/lupdate-pro/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate-pro.pro. - ##################################################################### ## lupdate-pro Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lupdate-pro) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Update Tool for QMake Projects" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/runqttool.cpp ../shared/runqttool.h @@ -22,16 +20,3 @@ qt_internal_add_tool(${target_name} ../shared ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lupdate-pro.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool for QMake Projects" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW: -# RC_FILE = "lupdate-pro.rc" diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt index b0b723904..0a1214f04 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate.pro. -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") message(WARNING "lupdate will not be built in this configuration.") return() @@ -12,7 +10,6 @@ endif() if (MINGW) set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY _qt_skip_separate_debug_info ON) endif() -# special case end ##################################################################### ## lupdate Tool: @@ -21,7 +18,7 @@ endif() qt_get_tool_target_name(target_name lupdate) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Update Tool" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist EXTRA_CMAKE_FILES "${CMAKE_CURRENT_LIST_DIR}/../GenerateLUpdateProject.cmake" SOURCES ../shared/numerus.cpp @@ -58,13 +55,6 @@ set_source_files_properties(python.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" - ## Scopes: ##################################################################### @@ -101,21 +91,13 @@ qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_clangcpp LUPDATE_CLANG_VERSION_MINOR=${QT_LIB_CLANG_VERSION_MINOR} LUPDATE_CLANG_VERSION_PATCH=${QT_LIB_CLANG_VERSION_PATCH} # special case end - LIBRARIES # special case - WrapLibClang::WrapLibClang # special case + LIBRARIES + WrapLibClang::WrapLibClang ) qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING) -# special case begin if(QT_FEATURE_clangcpp) set_property(SOURCE clangtoolastreader.cpp PROPERTY SKIP_AUTOMOC ON) endif() -# special case end - -#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath: -# QMAKE_RPATHDIR = "$$CLANG_LIBDIR" - -#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW: -# RC_FILE = "lupdate.rc" diff --git a/src/pixeltool/CMakeLists.txt b/src/pixeltool/CMakeLists.txt index eaac0ddfa..b430d3efb 100644 --- a/src/pixeltool/CMakeLists.txt +++ b/src/pixeltool/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from pixeltool.pro. - ##################################################################### ## pixeltool App: ##################################################################### @@ -18,10 +16,6 @@ qt_internal_add_app(pixeltool Qt::Widgets ) -#### Keys ignored in scope 1:.:.:pixeltool.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(pixeltool)" - ## Scopes: ##################################################################### diff --git a/src/qdbus/CMakeLists.txt b/src/qdbus/CMakeLists.txt index 82b5052ca..5504a4ca9 100644 --- a/src/qdbus/CMakeLists.txt +++ b/src/qdbus/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbus.pro. - if(NOT QT_FEATURE_qdbus) return() endif() diff --git a/src/qdbus/qdbus/CMakeLists.txt b/src/qdbus/qdbus/CMakeLists.txt index 5db48fb9f..2a4b56463 100644 --- a/src/qdbus/qdbus/CMakeLists.txt +++ b/src/qdbus/qdbus/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbus.pro. - ##################################################################### ## qdbus App: ##################################################################### diff --git a/src/qdbus/qdbusviewer/CMakeLists.txt b/src/qdbus/qdbusviewer/CMakeLists.txt index 192321a49..9bd959bd1 100644 --- a/src/qdbus/qdbusviewer/CMakeLists.txt +++ b/src/qdbus/qdbusviewer/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbusviewer.pro. - ##################################################################### ## qdbusviewer App: ##################################################################### @@ -52,11 +50,9 @@ if(APPLE) target_sources(qdbusviewer PRIVATE images/qdbusviewer.icns ) - # special case end # Set values to be replaced in the custom Info_mac.plist. set(ICON "qdbusviewer.icns") set(EXECUTABLE "qdbusviewer") - # special case end endif() if(WIN32) diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index 6aba97913..b3b1ef5ef 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdoc.pro. - -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") message(WARNING "qdoc will not be built in this configuration.") return() @@ -13,7 +10,6 @@ if (MINGW) set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY _qt_skip_separate_debug_info ON) endif() -# special case end ##################################################################### ## qdoc Tool: @@ -22,7 +18,7 @@ endif() qt_get_tool_target_name(target_name qdoc) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Documentation Compiler" - TOOLS_TARGET Tools # special case + TOOLS_TARGET Tools USER_FACING SOURCES aggregate.cpp @@ -88,11 +84,11 @@ qt_internal_add_tool(${target_name} xmlgenerator.cpp INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR} - LIBRARIES # special case - WrapLibClang::WrapLibClang # special case + LIBRARIES + WrapLibClang::WrapLibClang DEFINES #(CLANG_RESOURCE_DIR=\"/clang//include\") # special case remove - CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR} # special case + CLANG_RESOURCE_DIR=${QT_LIBCLANG_RESOURCE_DIR} # To provide the ability to workaround version-specific Clang issues. # A re-export of (LLVM|CLANG)_VERSION_MAJOR done in WrapLibClang.cmake LIBCLANG_VERSION_MAJOR=${QT_LIB_CLANG_VERSION_MAJOR} @@ -100,17 +96,6 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:qdoc.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Documentation Compiler" -# TR_EXCLUDE = "$$PWD/*" -# _OPTION = "host_build" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap: -# _REQUIREMENTS = "qtConfig(xmlstreamwriter)" - qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate LIBRARIES Qt::QmlPrivate @@ -121,9 +106,6 @@ qt_internal_extend_target(${target_name} CONDITION NOT TARGET Qt::QmlPrivate QT_NO_DECLARATIVE ) -#### Keys ignored in scope 6:.:.:qdoc.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath: -# QMAKE_RPATHDIR = "$$CLANG_LIBDIR" - qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC LINK_OPTIONS "/STACK:4194304" diff --git a/src/qev/CMakeLists.txt b/src/qev/CMakeLists.txt index 7cbcc7b68..33877da15 100644 --- a/src/qev/CMakeLists.txt +++ b/src/qev/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qev.pro. - ##################################################################### ## qev App: ##################################################################### @@ -14,7 +12,3 @@ qt_internal_add_app(qev Qt::Gui Qt::Widgets ) - -#### Keys ignored in scope 1:.:.:qev.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(qev)" diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt index d0ce960b5..34770bf4b 100644 --- a/src/qtattributionsscanner/CMakeLists.txt +++ b/src/qtattributionsscanner/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtattributionsscanner.pro. - ##################################################################### ## qtattributionsscanner Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qtattributionsscanner) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Source Code Attribution Scanner" - TOOLS_TARGET Tools # special case + TOOLS_TARGET Tools INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES jsongenerator.cpp jsongenerator.h @@ -25,9 +23,3 @@ qt_internal_add_tool(${target_name} QT_NO_CAST_TO_ASCII ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qtattributionsscanner.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Source Code Attribution Scanner" -# QT_FOR_CONFIG = "tools-private" -# _OPTION = "host_build" -# _REQUIREMENTS = "qtConfig(qtattributionsscanner)" diff --git a/src/qtdiag/CMakeLists.txt b/src/qtdiag/CMakeLists.txt index a0fc7e172..13dca7d11 100644 --- a/src/qtdiag/CMakeLists.txt +++ b/src/qtdiag/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtdiag.pro. - ##################################################################### ## qtdiag App: ##################################################################### @@ -21,10 +19,6 @@ set_target_properties(qtdiag PROPERTIES WIN32_EXECUTABLE FALSE ) -#### Keys ignored in scope 1:.:.:qtdiag.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(qtdiag)" - ## Scopes: ##################################################################### @@ -42,14 +36,12 @@ qt_internal_extend_target(qtdiag CONDITION TARGET Qt::Widgets Qt::GuiPrivate # special case QTBUG-83498 ) -# special case begin # QTBUG-83498 qt_internal_extend_target(qtdiag CONDITION NOT TARGET Qt::Widgets AND NOT QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::Gui Qt::GuiPrivate # special case QTBUG-83498 ) -# special case end qt_internal_extend_target(qtdiag CONDITION TARGET Qt::Network DEFINES diff --git a/src/qtplugininfo/CMakeLists.txt b/src/qtplugininfo/CMakeLists.txt index d003431a1..a7d2f7a21 100644 --- a/src/qtplugininfo/CMakeLists.txt +++ b/src/qtplugininfo/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtplugininfo.pro. - ##################################################################### ## qtplugininfo App: ##################################################################### @@ -14,7 +12,3 @@ qt_internal_add_app(qtplugininfo set_target_properties(qtplugininfo PROPERTIES WIN32_EXECUTABLE FALSE ) - -#### Keys ignored in scope 1:.:.:qtplugininfo.pro:<TRUE>: -# QT_FOR_CONFIG = "tools-private" -# _REQUIREMENTS = "qtConfig(qtplugininfo)" diff --git a/src/uiplugin/CMakeLists.txt b/src/uiplugin/CMakeLists.txt index c7ddfef05..523daf5cc 100644 --- a/src/uiplugin/CMakeLists.txt +++ b/src/uiplugin/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from uiplugin.pro. - ##################################################################### ## UiPlugin Module: ##################################################################### @@ -20,14 +18,9 @@ qt_internal_add_module(UiPlugin Qt::Widgets ) -# special case begin set(is_plugin "$<TARGET_PROPERTY:QT_PLUGIN_CLASS_NAME>") target_compile_definitions( UiPlugin INTERFACE $<$<BOOL:${is_plugin}>:QDESIGNER_EXPORT_WIDGETS> ) -# special case end - -#### Keys ignored in scope 1:.:.:uiplugin.pro:<TRUE>: -# MODULE_CONFIG = "designer_defines" diff --git a/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt index ade77eb1b..886518f01 100644 --- a/src/uitools/CMakeLists.txt +++ b/src/uitools/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from uitools.pro. - ##################################################################### ## UiTools Module: ##################################################################### @@ -48,4 +46,3 @@ qt_internal_extend_target(UiTools CONDITION TARGET Qt::OpenGL qt_internal_add_docs(UiTools doc/qtuitools.qdocconf ) - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 800bc265b..05cc44c74 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tests.pro. - if(QT_BUILD_STANDALONE_TESTS) # Add qt_find_package calls for extra dependencies that need to be found when building # the standalone tests here. diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 5a2e0ca1a..54326bd8b 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from auto.pro. - if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(linguist) add_subdirectory(qtattributionsscanner) @@ -18,9 +16,3 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qhelpindexmodel) add_subdirectory(qhelpprojectdata) endif() -# special case begin -# add_subdirectory(cmake) -# if (TARGET Qt::Linguist) -# add_subdirectory(cmake/linguist) -# endif() -# special case end diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 02f54ce52..b3af8f2c2 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# special case skip regeneration - # This is an automatic test for the CMake configuration files. # To run it manually, # 1) mkdir build # Create a build directory diff --git a/tests/auto/linguist/CMakeLists.txt b/tests/auto/linguist/CMakeLists.txt index 85e2da5c4..a651fd3ec 100644 --- a/tests/auto/linguist/CMakeLists.txt +++ b/tests/auto/linguist/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - add_subdirectory(lrelease) add_subdirectory(lconvert) add_subdirectory(lupdate) diff --git a/tests/auto/linguist/lconvert/CMakeLists.txt b/tests/auto/linguist/lconvert/CMakeLists.txt index 09892ee57..91d658eb4 100644 --- a/tests/auto/linguist/lconvert/CMakeLists.txt +++ b/tests/auto/linguist/lconvert/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lconvert.pro. - ##################################################################### ## tst_lconvert Test: ##################################################################### diff --git a/tests/auto/linguist/lrelease/CMakeLists.txt b/tests/auto/linguist/lrelease/CMakeLists.txt index a286a5fce..4ba7a6c86 100644 --- a/tests/auto/linguist/lrelease/CMakeLists.txt +++ b/tests/auto/linguist/lrelease/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease.pro. - ##################################################################### ## tst_lrelease Test: ##################################################################### diff --git a/tests/auto/linguist/lupdate/CMakeLists.txt b/tests/auto/linguist/lupdate/CMakeLists.txt index a03076603..3501bb43c 100644 --- a/tests/auto/linguist/lupdate/CMakeLists.txt +++ b/tests/auto/linguist/lupdate/CMakeLists.txt @@ -1,14 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate.pro. - -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release) message(WARNING "tst_lupdate will not be built in this configuration.") return() endif() -# special case end ##################################################################### ## tst_lupdate Test: diff --git a/tests/auto/qdoc/CMakeLists.txt b/tests/auto/qdoc/CMakeLists.txt index 6af8627f1..a75fdcaf3 100644 --- a/tests/auto/qdoc/CMakeLists.txt +++ b/tests/auto/qdoc/CMakeLists.txt @@ -1,14 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdoc.pro. - -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND QT_FEATURE_debug_and_release) message(WARNING "qdoc tests will not be built in this configuration.") return() endif() -# special case end add_subdirectory(catch_generators) add_subdirectory(qdoc) diff --git a/tests/auto/qdoc/config/CMakeLists.txt b/tests/auto/qdoc/config/CMakeLists.txt index d384ded14..9836fb1f0 100644 --- a/tests/auto/qdoc/config/CMakeLists.txt +++ b/tests/auto/qdoc/config/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from config.pro. - ##################################################################### ## tst_config Test: ##################################################################### diff --git a/tests/auto/qdoc/generatedoutput/CMakeLists.txt b/tests/auto/qdoc/generatedoutput/CMakeLists.txt index a98d64a7b..4a50e2e50 100644 --- a/tests/auto/qdoc/generatedoutput/CMakeLists.txt +++ b/tests/auto/qdoc/generatedoutput/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from generatedoutput.pro. -# special case skip regeneration # It's mostly manually written. ##################################################################### diff --git a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt index ef872534e..1ebe4f3e2 100644 --- a/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt +++ b/tests/auto/qdoc/qdoccommandlineparser/CMakeLists.txt @@ -1,14 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdoccommandlineparser.pro. ##################################################################### ## tst_qdoccommandlineparser Test: ##################################################################### qt_internal_add_test(tst_qdoccommandlineparser - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" # special case + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" SOURCES ../../../../src/qdoc/qdoccommandlineparser.cpp ../../../../src/qdoc/qdoccommandlineparser.h ../../../../src/qdoc/utilities.cpp ../../../../src/qdoc/utilities.h diff --git a/tests/auto/qdoc/utilities/CMakeLists.txt b/tests/auto/qdoc/utilities/CMakeLists.txt index 8d5357282..17615e1a6 100644 --- a/tests/auto/qdoc/utilities/CMakeLists.txt +++ b/tests/auto/qdoc/utilities/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from utilities.pro. - ##################################################################### ## tst_utilities Test: ##################################################################### diff --git a/tests/auto/qhelpcontentmodel/CMakeLists.txt b/tests/auto/qhelpcontentmodel/CMakeLists.txt index 977920e87..a176f4a0f 100644 --- a/tests/auto/qhelpcontentmodel/CMakeLists.txt +++ b/tests/auto/qhelpcontentmodel/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpcontentmodel.pro. - ##################################################################### ## tst_qhelpcontentmodel Test: ##################################################################### diff --git a/tests/auto/qhelpenginecore/CMakeLists.txt b/tests/auto/qhelpenginecore/CMakeLists.txt index 370ecaba5..66b27f0f6 100644 --- a/tests/auto/qhelpenginecore/CMakeLists.txt +++ b/tests/auto/qhelpenginecore/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpenginecore.pro. ##################################################################### ## tst_qhelpenginecore Test: diff --git a/tests/auto/qhelpgenerator/CMakeLists.txt b/tests/auto/qhelpgenerator/CMakeLists.txt index 53047fa3a..624d9fe4e 100644 --- a/tests/auto/qhelpgenerator/CMakeLists.txt +++ b/tests/auto/qhelpgenerator/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpgenerator.pro. - ##################################################################### ## tst_qhelpgenerator Test: ##################################################################### diff --git a/tests/auto/qhelpindexmodel/CMakeLists.txt b/tests/auto/qhelpindexmodel/CMakeLists.txt index 291e73b10..b3dd60f26 100644 --- a/tests/auto/qhelpindexmodel/CMakeLists.txt +++ b/tests/auto/qhelpindexmodel/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpindexmodel.pro. - ##################################################################### ## tst_qhelpindexmodel Test: ##################################################################### diff --git a/tests/auto/qhelpprojectdata/CMakeLists.txt b/tests/auto/qhelpprojectdata/CMakeLists.txt index 7544d8800..50607c5fe 100644 --- a/tests/auto/qhelpprojectdata/CMakeLists.txt +++ b/tests/auto/qhelpprojectdata/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qhelpprojectdata.pro. - ##################################################################### ## tst_qhelpprojectdata Test: ##################################################################### diff --git a/tests/auto/qtattributionsscanner/CMakeLists.txt b/tests/auto/qtattributionsscanner/CMakeLists.txt index 7e516a93b..0b93f14d3 100644 --- a/tests/auto/qtattributionsscanner/CMakeLists.txt +++ b/tests/auto/qtattributionsscanner/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtattributionsscanner.pro. - ##################################################################### ## tst_qtattributionsscanner Test: ##################################################################### @@ -15,6 +13,3 @@ qt_internal_add_test(tst_qtattributionsscanner target_compile_definitions(tst_qtattributionsscanner PRIVATE QTTOOLS_LICENSES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../LICENSES" ) - -#### Keys ignored in scope 1:.:.:qtattributionsscanner.pro:<TRUE>: -# DISTFILES = "testdata/good/expected.json" "testdata/good/expected.error" "testdata/good/minimal/qt_attribution_test.json" "testdata/good/minimal/expected.json" "testdata/good/minimal/expected.error" "testdata/good/complete/qt_attribution_test.json" "testdata/good/complete/expected.json" "testdata/good/complete/expected.error" "testdata/good/variants/qt_attribution_test.json" "testdata/good/variants/expected.json" "testdata/good/variants/expected.error" "testdata/warnings/incomplete/qt_attribution_test.json" "testdata/warnings/incomplete/expected.json" "testdata/warnings/incomplete/expected.error" "testdata/warnings/unknown/qt_attribution_test.json" "testdata/warnings/unknown/expected.json" "testdata/warnings/unknown/expected.error" diff --git a/tests/auto/qtdiag/CMakeLists.txt b/tests/auto/qtdiag/CMakeLists.txt index 8ed99e960..054a16395 100644 --- a/tests/auto/qtdiag/CMakeLists.txt +++ b/tests/auto/qtdiag/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtdiag.pro. - ##################################################################### ## tst_tdiag Test: ##################################################################### diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index bd7cd4900..278ae6fdb 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,6 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from manual.pro. - add_subdirectory(qtattributionsscanner) diff --git a/tests/manual/qtattributionsscanner/CMakeLists.txt b/tests/manual/qtattributionsscanner/CMakeLists.txt index 878f96a6d..8b1378917 100644 --- a/tests/manual/qtattributionsscanner/CMakeLists.txt +++ b/tests/manual/qtattributionsscanner/CMakeLists.txt @@ -1,2 +1 @@ -# Generated from qtattributionsscanner.pro. |