diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 14:04:17 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 22:49:41 +0100 |
commit | 1e0539ea51b75d9404ccc9506fcc0cdfa6951307 (patch) | |
tree | b9033bc13a4f4611cf430a92236e9b93c460904e /src/assistant | |
parent | 1f859ca1ac6d337aedde2fe8eed74266416ae0d1 (diff) | |
download | qttools-1e0539ea51b75d9404ccc9506fcc0cdfa6951307.tar.gz |
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/assistant')
-rw-r--r-- | src/assistant/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/assistant/assistant/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/assistant/help/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/assistant/qhelpgenerator/CMakeLists.txt | 4 |
4 files changed, 2 insertions, 23 deletions
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 |