feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Use version-less Qt targets

Browse Source 
Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2022-12-20 17:31:22 +01:00
parent 894685d501
commit 55fa109b59
105 changed files with 184 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -54,7 +54,7 @@ set(CMAKE_AUTOUIC ON)
if (WITH_TESTS) if (WITH_TESTS)
set(QT_TEST_COMPONENT Test) set(QT_TEST_COMPONENT Test)
set(IMPLICIT_DEPENDS Qt5::Test) set(IMPLICIT_DEPENDS Qt::Test)
endif() endif()
# suppress bogus warning # suppress bogus warning
@@ -124,12 +124,12 @@ function (set_if_target var target)
set(${var} "${_result}" PARENT_SCOPE) set(${var} "${_result}" PARENT_SCOPE)
endfunction() endfunction()
set_if_target(_has_svg_target Qt5::Svg) set_if_target(_has_svg_target Qt::Svg)
option(ENABLE_SVG_SUPPORT "Enable SVG support" "${_has_svg_target}") option(ENABLE_SVG_SUPPORT "Enable SVG support" "${_has_svg_target}")
add_library(OptionalSvg INTERFACE) add_library(OptionalSvg INTERFACE)
if (TARGET Qt5::Svg AND ENABLE_SVG_SUPPORT) if (TARGET Qt::Svg AND ENABLE_SVG_SUPPORT)
target_link_libraries(OptionalSvg INTERFACE Qt5::Svg) target_link_libraries(OptionalSvg INTERFACE Qt::Svg)
else() else()
target_compile_definitions(OptionalSvg INTERFACE QT_NO_SVG) target_compile_definitions(OptionalSvg INTERFACE QT_NO_SVG)
endif() endif()

4
cmake/QtCreatorAPI.cmake
View File

@@ -1054,11 +1054,11 @@ function(qtc_add_resources target resourceName)
# Process .qrc file: # Process .qrc file:
add_custom_command(OUTPUT "${generatedSourceCode}" add_custom_command(OUTPUT "${generatedSourceCode}"
COMMAND Qt5::rcc ${rccArgs} COMMAND Qt::rcc ${rccArgs}
DEPENDS DEPENDS
${resource_dependencies} ${resource_dependencies}
${generatedResourceFile} ${generatedResourceFile}
"Qt5::rcc" "Qt::rcc"
COMMENT "RCC ${newResourceName}" COMMENT "RCC ${newResourceName}"
VERBATIM) VERBATIM)

11
cmake/QtCreatorAPIInternal.cmake
View File

@@ -277,7 +277,8 @@ function(finalize_test_setup test_name)
list(APPEND env_path $ENV{PATH}) list(APPEND env_path $ENV{PATH})
list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_PLUGIN_PATH}) list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_PLUGIN_PATH})
list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_BIN_PATH}) list(APPEND env_path ${CMAKE_BINARY_DIR}/${_IDE_BIN_PATH})
list(APPEND env_path $<TARGET_FILE_DIR:Qt5::Test>) # version-less target Qt::Test is an interface library that links to QtX::Test
list(APPEND env_path $<TARGET_FILE_DIR:$<TARGET_PROPERTY:Qt::Test,INTERFACE_LINK_LIBRARIES>>)
if (TARGET libclang) if (TARGET libclang)
list(APPEND env_path $<TARGET_FILE_DIR:libclang>) list(APPEND env_path $<TARGET_FILE_DIR:libclang>)
endif() endif()
@@ -430,15 +431,15 @@ function(enable_pch target)
PROPERTIES GENERATED TRUE) PROPERTIES GENERATED TRUE)
_add_pch_target(${PROJECT_NAME}PchGui _add_pch_target(${PROJECT_NAME}PchGui
"${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h" Qt5::Widgets) "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h" Qt::Widgets)
_add_pch_target(${PROJECT_NAME}PchConsole _add_pch_target(${PROJECT_NAME}PchConsole
"${QtCreator_SOURCE_DIR}/src/shared/qtcreator_pch.h" Qt5::Core) "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_pch.h" Qt::Core)
endif() endif()
unset(PCH_TARGET) unset(PCH_TARGET)
if ("Qt5::Widgets" IN_LIST dependencies) if ("Qt::Widgets" IN_LIST dependencies)
set(PCH_TARGET ${PROJECT_NAME}PchGui) set(PCH_TARGET ${PROJECT_NAME}PchGui)
elseif ("Qt5::Core" IN_LIST dependencies) elseif ("Qt::Core" IN_LIST dependencies)
set(PCH_TARGET ${PROJECT_NAME}PchConsole) set(PCH_TARGET ${PROJECT_NAME}PchConsole)
endif() endif()

12
cmake/QtCreatorDocumentation.cmake
View File

@@ -9,7 +9,7 @@ add_feature_info("Build online documentation" WITH_ONLINE_DOCS "")
# as this is not yet exported by cmake. # as this is not yet exported by cmake.
# Used for QT_INSTALL_DOCS # Used for QT_INSTALL_DOCS
function(qt5_query_qmake) function(qt5_query_qmake)
if (NOT TARGET Qt5::qmake) if (NOT TARGET Qt::qmake)
message(FATAL_ERROR "Qmake was not found. Add find_package(Qt5 COMPONENTS Core) to CMake to enable.") message(FATAL_ERROR "Qmake was not found. Add find_package(Qt5 COMPONENTS Core) to CMake to enable.")
endif() endif()
# dummy check for if we already queried qmake # dummy check for if we already queried qmake
@@ -17,7 +17,7 @@ function(qt5_query_qmake)
return() return()
endif() endif()
get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION) get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
execute_process(COMMAND "${_qmake_binary}" "-query" execute_process(COMMAND "${_qmake_binary}" "-query"
TIMEOUT 10 TIMEOUT 10
RESULT_VARIABLE _qmake_result RESULT_VARIABLE _qmake_result
@@ -45,11 +45,11 @@ endfunction()
# Find programs: # Find programs:
function(_doc_find_program result_var) function(_doc_find_program result_var)
if (NOT TARGET Qt5::qmake) if (NOT TARGET Qt::qmake)
message(FATAL_ERROR "QDoc is only available in Qt5 projects") message(FATAL_ERROR "QDoc is only available in Qt5 projects")
endif() endif()
get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION) get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
get_filename_component(_qmake_dir "${_qmake_binary}" DIRECTORY) get_filename_component(_qmake_dir "${_qmake_binary}" DIRECTORY)
find_program("_prg_${result_var}" ${ARGN} HINTS "${_qmake_dir}") find_program("_prg_${result_var}" ${ARGN} HINTS "${_qmake_dir}")
if ("_prg_${result_var}" STREQUAL "_prg_${result_var}-NOTFOUND") if ("_prg_${result_var}" STREQUAL "_prg_${result_var}-NOTFOUND")
@@ -153,7 +153,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
set(_arg_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") set(_arg_QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc")
endif() endif()
if (NOT TARGET Qt5::qhelpgenerator) if (NOT TARGET Qt::qhelpgenerator)
message(WARNING "qhelpgenerator missing: No QCH documentation targets were generated. Add find_package(Qt5 COMPONENTS Help) to CMake to enable.") message(WARNING "qhelpgenerator missing: No QCH documentation targets were generated. Add find_package(Qt5 COMPONENTS Help) to CMake to enable.")
return() return()
endif() endif()
@@ -166,7 +166,7 @@ function(_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
set(_qch_target "qch_docs_${_target}") set(_qch_target "qch_docs_${_target}")
set(_html_target "html_docs_${_target}") set(_html_target "html_docs_${_target}")
add_custom_target("${_qch_target}" add_custom_target("${_qch_target}"
Qt5::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch" Qt::qhelpgenerator "${_html_outputdir}/${_target}.qhp" -o "${_qch_outputdir}/${_target}.qch"
COMMENT "Build QCH documentation from ${_qdocconf_file}" COMMENT "Build QCH documentation from ${_qdocconf_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
VERBATIM VERBATIM

10
cmake/QtCreatorTranslations.cmake
View File

@@ -91,7 +91,7 @@ function(_create_ts_custom_target name)
file(WRITE "${ts_file_list}" "${_sources_str}\n${_includes_str}\n") file(WRITE "${ts_file_list}" "${_sources_str}\n${_includes_str}\n")
add_custom_target("${_arg_TS_TARGET_PREFIX}${name}" add_custom_target("${_arg_TS_TARGET_PREFIX}${name}"
COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files} COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Generate .ts files" COMMENT "Generate .ts files"
DEPENDS ${_sources} DEPENDS ${_sources}
@@ -103,11 +103,11 @@ function(_create_ts_custom_target name)
list(LENGTH ts_files file_count) list(LENGTH ts_files file_count)
if(file_count EQUAL 1) if(file_count EQUAL 1)
# get path for lconvert... # get path for lconvert...
get_target_property(_lupdate_binary Qt5::lupdate IMPORTED_LOCATION) get_target_property(_lupdate_binary Qt::lupdate IMPORTED_LOCATION)
get_filename_component(_bin_dir ${_lupdate_binary} DIRECTORY) get_filename_component(_bin_dir ${_lupdate_binary} DIRECTORY)
add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned" add_custom_target("${_arg_TS_TARGET_PREFIX}${name}_cleaned"
COMMAND Qt5::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files} COMMAND Qt::lupdate -locations relative -no-ui-lines -no-sort "@${ts_file_list}" -ts ${ts_files}
COMMAND ${_bin_dir}/lconvert -locations none -no-ui-lines -no-obsolete ${ts_files} -o ${ts_files} COMMAND ${_bin_dir}/lconvert -locations none -no-ui-lines -no-obsolete ${ts_files} -o ${ts_files}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number" COMMENT "Generate .ts files, remove obsolete and vanished translations, and do not add files and line number"
@@ -117,7 +117,7 @@ function(_create_ts_custom_target name)
endfunction() endfunction()
function(add_translation_targets file_prefix) function(add_translation_targets file_prefix)
if (NOT TARGET Qt5::lrelease OR NOT TARGET Qt5::lupdate) if (NOT TARGET Qt::lrelease OR NOT TARGET Qt::lupdate)
# No Qt translation tools were found: Skip this directory # No Qt translation tools were found: Skip this directory
message(WARNING "No Qt translation tools found, skipping translation targets. Add find_package(Qt5 COMPONENTS LinguistTools) to CMake to enable.") message(WARNING "No Qt translation tools found, skipping translation targets. Add find_package(Qt5 COMPONENTS LinguistTools) to CMake to enable.")
return() return()
@@ -170,7 +170,7 @@ function(add_translation_targets file_prefix)
SOURCES ${_to_process_sources} ${_arg_SOURCES} INCLUDES ${_to_process_includes} ${_arg_INCLUDES}) SOURCES ${_to_process_sources} ${_arg_SOURCES} INCLUDES ${_to_process_includes} ${_arg_INCLUDES})
add_custom_command(OUTPUT "${_qm_file}" add_custom_command(OUTPUT "${_qm_file}"
COMMAND Qt5::lrelease "${_ts_file}" -qm "${_qm_file}" COMMAND Qt::lrelease "${_ts_file}" -qm "${_qm_file}"
MAIN_DEPENDENCY "${_ts_file}" MAIN_DEPENDENCY "${_ts_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMENT "Generate .qm file" COMMENT "Generate .qm file"

2
cmake/Utils.cmake
View File

@@ -11,7 +11,7 @@ function(setup_dependencies_component)
if (NOT Python3_Interpreter_FOUND) if (NOT Python3_Interpreter_FOUND)
message("No python interpreter found, skipping \"Dependencies\" install component.") message("No python interpreter found, skipping \"Dependencies\" install component.")
else() else()
get_target_property(_qmake_binary Qt5::qmake IMPORTED_LOCATION) get_target_property(_qmake_binary Qt::qmake IMPORTED_LOCATION)
set(_llvm_arg) set(_llvm_arg)
if (LLVM_INSTALL_PREFIX) if (LLVM_INSTALL_PREFIX)
set(_llvm_arg "--llvm \"${LLVM_INSTALL_PREFIX}\"") set(_llvm_arg "--llvm \"${LLVM_INSTALL_PREFIX}\"")

4
doc/CMakeLists.txt
View File

@@ -25,7 +25,9 @@ function(_find_all_includes _ret_includes _ret_framework_paths)
# framework path # framework path
if (APPLE) if (APPLE)
get_target_property(_qt_target Qt5::Core LOCATION) # <fw_path>/QtCore.framework/QtCore # version-less target Qt::Core is an interface library that links to QtX::Core
get_target_property(_qt_core Qt::Core INTERFACE_LINK_LIBRARIES)
get_target_property(_qt_target ${_qt_core} LOCATION) # <fw_path>/QtCore.framework/QtCore
get_filename_component(_qt_loc "${_qt_target}" DIRECTORY) get_filename_component(_qt_loc "${_qt_target}" DIRECTORY)
set("${_ret_framework_paths}" "${_qt_loc}/.." PARENT_SCOPE) set("${_ret_framework_paths}" "${_qt_loc}/.." PARENT_SCOPE)
endif() endif()

2
src/app/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ install(
add_qtc_executable(qtcreator add_qtc_executable(qtcreator
DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\"
DEPENDS Aggregation ExtensionSystem Qt5::Core Qt5::Widgets Utils shared_qtsingleapplication app_version DEPENDS Aggregation ExtensionSystem Qt::Core Qt::Widgets Utils shared_qtsingleapplication app_version
SOURCES SOURCES
main.cpp main.cpp
../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h

2
src/libs/3rdparty/cplusplus/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
add_qtc_library(3rd_cplusplus OBJECT add_qtc_library(3rd_cplusplus OBJECT
PUBLIC_DEPENDS Qt5::Core Utils PUBLIC_DEPENDS Qt::Core Utils
SOURCES SOURCES
AST.cpp AST.h AST.cpp AST.h
ASTClone.cpp ASTClone.cpp

2
src/libs/3rdparty/syntax-highlighting/CMakeLists.txt vendored
View File

@@ -11,7 +11,7 @@ add_qtc_library(KSyntaxHighlighting
src/lib src/lib
autogenerated/include autogenerated/include
autogenerated/src/lib autogenerated/src/lib
DEPENDS Qt5::Network Qt5::Widgets DEPENDS Qt::Network Qt::Widgets
SOURCES SOURCES
autogenerated/src/lib/ksyntaxhighlighting_logging.cpp autogenerated/src/lib/ksyntaxhighlighting_logging.h autogenerated/src/lib/ksyntaxhighlighting_logging.cpp autogenerated/src/lib/ksyntaxhighlighting_logging.h
autogenerated/ksyntaxhighlighting_version.h autogenerated/ksyntaxhighlighting_version.h

2
src/libs/3rdparty/syntax-highlighting/src/indexer/CMakeLists.txt vendored
View File

@@ -32,7 +32,7 @@ else()
add_executable(katehighlightingindexer katehighlightingindexer.cpp ../lib/worddelimiters.cpp) add_executable(katehighlightingindexer katehighlightingindexer.cpp ../lib/worddelimiters.cpp)
ecm_mark_nongui_executable(katehighlightingindexer) ecm_mark_nongui_executable(katehighlightingindexer)
if(Qt5XmlPatterns_FOUND AND NOT ECM_ENABLE_SANITIZERS) if(Qt5XmlPatterns_FOUND AND NOT ECM_ENABLE_SANITIZERS)
target_link_libraries(katehighlightingindexer Qt5::XmlPatterns) target_link_libraries(katehighlightingindexer Qt::XmlPatterns)
else() else()
target_link_libraries(katehighlightingindexer Qt${QT_MAJOR_VERSION}::Core) target_link_libraries(katehighlightingindexer Qt${QT_MAJOR_VERSION}::Core)
endif() endif()

2
src/libs/advanceddockingsystem/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(AdvancedDockingSystem add_qtc_library(AdvancedDockingSystem
DEPENDS Qt5::Widgets Qt5::Core Qt5::Gui Utils DEPENDS Qt::Widgets Qt::Core Qt::Gui Utils
SOURCES SOURCES
ads_globals.cpp ads_globals.h ads_globals.cpp ads_globals.h
advanceddockingsystemtr.h advanceddockingsystemtr.h

2
src/libs/aggregation/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(Aggregation add_qtc_library(Aggregation
DEPENDS Qt5::Core DEPENDS Qt::Core
SOURCES SOURCES
aggregate.cpp aggregate.h aggregate.cpp aggregate.h
aggregation_global.h aggregation_global.h

6
src/libs/cplusplus/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
# TODO: Make Qt5::Gui optional -- if really needed that is. # TODO: Make Qt::Gui optional -- if really needed that is.
add_qtc_library(CPlusPlus add_qtc_library(CPlusPlus
DEPENDS Utils Qt5::Concurrent DEPENDS Utils Qt::Concurrent
PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui PUBLIC_DEPENDS 3rd_cplusplus Qt::Gui
SOURCES SOURCES
ASTParent.cpp ASTParent.h ASTParent.cpp ASTParent.h
ASTPath.cpp ASTPath.h ASTPath.cpp ASTPath.h

6
src/libs/extensionsystem/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(ExtensionSystem add_qtc_library(ExtensionSystem
DEPENDS Aggregation Utils DEPENDS Aggregation Utils
PUBLIC_DEPENDS Qt5::Core Qt5::Widgets PUBLIC_DEPENDS Qt::Core Qt::Widgets
SOURCES SOURCES
extensionsystem_global.h extensionsystem_global.h
extensionsystemtr.h extensionsystemtr.h
@@ -22,7 +22,7 @@ add_qtc_library(ExtensionSystem
find_package(Qt5 COMPONENTS Test QUIET) find_package(Qt5 COMPONENTS Test QUIET)
extend_qtc_library(ExtensionSystem extend_qtc_library(ExtensionSystem
CONDITION TARGET Qt5::Test CONDITION TARGET Qt::Test
DEPENDS Qt5::Test DEPENDS Qt::Test
DEFINES WITH_TESTS DEFINES WITH_TESTS
) )

2
src/libs/glsl/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(GLSL add_qtc_library(GLSL
DEPENDS Qt5::Core DEPENDS Qt::Core
SOURCES SOURCES
glsl.h glsl.h
glslast.cpp glslast.h glslast.cpp glslast.h

2
src/libs/languageutils/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(LanguageUtils add_qtc_library(LanguageUtils
PUBLIC_DEPENDS Qt5::Core PUBLIC_DEPENDS Qt::Core
SOURCES SOURCES
componentversion.cpp componentversion.h componentversion.cpp componentversion.h
fakemetaobject.cpp fakemetaobject.h fakemetaobject.cpp fakemetaobject.h

2
src/libs/modelinglib/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(Modeling add_qtc_library(Modeling
DEPENDS Qt5::Widgets Utils DEPENDS Qt::Widgets Utils
PUBLIC_DEPENDS OptionalSvg PUBLIC_DEPENDS OptionalSvg
INCLUDES qtserialization/inc INCLUDES qtserialization/inc
PUBLIC_INCLUDES PUBLIC_INCLUDES

2
src/libs/nanotrace/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ add_qtc_library(Nanotrace
DEFINES NANOTRACE_LIBRARY DEFINES NANOTRACE_LIBRARY
PUBLIC_DEFINES NANOTRACE_ENABLED PUBLIC_DEFINES NANOTRACE_ENABLED
SOURCES nanotrace.cpp nanotrace.h SOURCES nanotrace.cpp nanotrace.h
PUBLIC_DEPENDS Qt5::Core PUBLIC_DEPENDS Qt::Core
PROPERTIES PROPERTIES
CXX_VISIBILITY_PRESET default CXX_VISIBILITY_PRESET default
VISIBILITY_INLINES_HIDDEN OFF VISIBILITY_INLINES_HIDDEN OFF

2
src/libs/qmldebug/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(QmlDebug add_qtc_library(QmlDebug
DEPENDS Qt5::Network Utils DEPENDS Qt::Network Utils
SOURCES SOURCES
baseenginedebugclient.cpp baseenginedebugclient.h baseenginedebugclient.cpp baseenginedebugclient.h
basetoolsclient.cpp basetoolsclient.h basetoolsclient.cpp basetoolsclient.h

2
src/libs/qmleditorwidgets/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(QmlEditorWidgets add_qtc_library(QmlEditorWidgets
DEPENDS QmlJS Utils Qt5::Widgets DEPENDS QmlJS Utils Qt::Widgets
SOURCES SOURCES
colorbox.cpp colorbox.h colorbox.cpp colorbox.h
colorbutton.cpp colorbutton.h colorbutton.cpp colorbutton.h

4
src/libs/qmljs/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(QmlJS add_qtc_library(QmlJS
DEPENDS ExtensionSystem Utils Qt5::Xml DEPENDS ExtensionSystem Utils Qt::Xml
PUBLIC_DEPENDS CPlusPlus Qt5::Widgets LanguageUtils PUBLIC_DEPENDS CPlusPlus Qt::Widgets LanguageUtils
SOURCES SOURCES
jsoncheck.cpp jsoncheck.h jsoncheck.cpp jsoncheck.h
parser/qmldirparser.cpp parser/qmldirparser_p.h parser/qmldirparser.cpp parser/qmldirparser_p.h

2
src/libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake
View File

@@ -1,6 +1,6 @@
add_qtc_library(QmlPuppetCommunication STATIC add_qtc_library(QmlPuppetCommunication STATIC
PROPERTIES AUTOUIC OFF PROPERTIES AUTOUIC OFF
DEPENDS Qt5::Core Qt5::CorePrivate Qt5::Gui DEPENDS Qt::Core Qt::CorePrivate Qt::Gui
) )
extend_qtc_library(QmlPuppetCommunication extend_qtc_library(QmlPuppetCommunication

2
src/libs/sqlite/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ add_qtc_library(SqliteC OBJECT
add_qtc_library(Sqlite add_qtc_library(Sqlite
PROPERTIES AUTOMOC OFF AUTOUIC OFF PROPERTIES AUTOMOC OFF AUTOUIC OFF
DEPENDS Qt5::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteC
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0
PUBLIC_INCLUDES PUBLIC_INCLUDES
"${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}"

6
src/libs/tracing/CMakeLists.txt
View File

@@ -36,10 +36,10 @@ set(TRACING_CPP_SOURCES
find_package(Qt6 COMPONENTS ShaderTools QUIET) find_package(Qt6 COMPONENTS ShaderTools QUIET)
add_qtc_library(Tracing add_qtc_library(Tracing
CONDITION TARGET Qt6::ShaderTools AND TARGET Qt5::Quick CONDITION TARGET Qt6::ShaderTools AND TARGET Qt::Quick
FEATURE_INFO FEATURE_INFO
DEPENDS Utils Qt5::Quick DEPENDS Utils Qt::Quick
PUBLIC_DEPENDS Qt5::Widgets Qt5::Qml PUBLIC_DEPENDS Qt::Widgets Qt::Qml
SOURCES SOURCES
${TEST_SOURCES} ${TEST_SOURCES}
) )

8
src/libs/utils/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_qtc_library(Utils add_qtc_library(Utils
DEPENDS Qt5::Qml Qt5::Xml DEPENDS Qt::Qml Qt::Xml
PUBLIC_DEPENDS PUBLIC_DEPENDS
Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Gui Qt5::Widgets Qt::Concurrent Qt::Core Qt::Network Qt::Gui Qt::Widgets
Qt6Core5Compat Qt6Core5Compat
SOURCES SOURCES
../3rdparty/span/span.hpp ../3rdparty/span/span.hpp
@@ -254,8 +254,8 @@ extend_qtc_library(Utils CONDITION UNIX AND NOT APPLE
) )
extend_qtc_library(Utils extend_qtc_library(Utils
CONDITION TARGET Qt5::CorePrivate CONDITION TARGET Qt::CorePrivate
DEPENDS Qt5::CorePrivate DEPENDS Qt::CorePrivate
DEFINES QTC_UTILS_WITH_FSENGINE DEFINES QTC_UTILS_WITH_FSENGINE
SOURCES fsengine/fsengine_impl.cpp SOURCES fsengine/fsengine_impl.cpp
fsengine/fsengine_impl.h fsengine/fsengine_impl.h

2
src/plugins/android/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Android add_qtc_plugin(Android
DEPENDS QmlDebug Qt5::Xml LanguageServerProtocol DEPENDS QmlDebug Qt::Xml LanguageServerProtocol
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport LanguageClient
SOURCES SOURCES
android.qrc android.qrc

2
src/plugins/beautifier/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Beautifier add_qtc_plugin(Beautifier
DEPENDS Qt5::Xml DEPENDS Qt::Xml
PLUGIN_DEPENDS Core ProjectExplorer TextEditor PLUGIN_DEPENDS Core ProjectExplorer TextEditor
SOURCES SOURCES
abstractsettings.cpp abstractsettings.h abstractsettings.cpp abstractsettings.h

2
src/plugins/boot2qt/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(Boot2Qt add_qtc_plugin(Boot2Qt
PLUGIN_CLASS QdbPlugin PLUGIN_CLASS QdbPlugin
DEPENDS Qt5::Network DEPENDS Qt::Network
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
SOURCES SOURCES
qdb.qrc qdb.qrc

2
src/plugins/clangformat/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(ClangFormat add_qtc_plugin(ClangFormat
CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB) CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB} DEPENDS Utils Qt::Widgets ${CLANG_FORMAT_LIB}
PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
SOURCES SOURCES
clangformatbaseindenter.cpp clangformatbaseindenter.h clangformatbaseindenter.cpp clangformatbaseindenter.h

2
src/plugins/clangtools/unit-tests/exported-diagnostics/CMakeLists.txt
View File

@@ -20,4 +20,4 @@ add_executable(clangtools
tidy.modernize-use-nullptr.cpp tidy.modernize-use-nullptr.cpp
) )
target_link_libraries(clangtools PRIVATE Qt5::Widgets) target_link_libraries(clangtools PRIVATE Qt::Widgets)

2
src/plugins/coreplugin/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ endif()
configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc) configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc)
add_qtc_plugin(Core add_qtc_plugin(Core
DEPENDS Qt5::PrintSupport Qt5::Qml Qt5::Sql Qt5::Gui Qt5::GuiPrivate DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate
PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version PUBLIC_DEPENDS Aggregation ExtensionSystem Utils app_version
SOURCES SOURCES
actionmanager/actioncontainer.cpp actionmanager/actioncontainer.h actionmanager/actioncontainer_p.h actionmanager/actioncontainer.cpp actionmanager/actioncontainer.h actionmanager/actioncontainer_p.h

2
src/plugins/cpaster/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ add_subdirectory(frontend)
add_qtc_plugin(CodePaster add_qtc_plugin(CodePaster
PLUGIN_DEPENDS Core TextEditor PLUGIN_DEPENDS Core TextEditor
DEFINES CPASTER_PLUGIN_GUI DEFINES CPASTER_PLUGIN_GUI
DEPENDS Qt5::Network DEPENDS Qt::Network
INCLUDES ../../shared/cpaster INCLUDES ../../shared/cpaster
SOURCES SOURCES
codepasterservice.h codepasterservice.h

2
src/plugins/cpaster/frontend/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_executable(cpaster add_qtc_executable(cpaster
DEPENDS Core Utils Qt5::Network DEPENDS Core Utils Qt::Network
SOURCES SOURCES
argumentscollector.cpp argumentscollector.h argumentscollector.cpp argumentscollector.h
main.cpp main.cpp

2
src/plugins/cppcheck/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Cppcheck add_qtc_plugin(Cppcheck
DEPENDS Qt5::Widgets DEPENDS Qt::Widgets
PLUGIN_DEPENDS Core Debugger CppEditor ProjectExplorer TextEditor PLUGIN_DEPENDS Core Debugger CppEditor ProjectExplorer TextEditor
SOURCES SOURCES
cppcheckconstants.h cppcheckconstants.h

4
src/plugins/cppeditor/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(CppEditor add_qtc_plugin(CppEditor
DEPENDS Qt5::Network Qt5::Xml DEPENDS Qt::Network Qt::Xml
PUBLIC_DEPENDS CPlusPlus Qt5::Widgets PUBLIC_DEPENDS CPlusPlus Qt::Widgets
PLUGIN_DEPENDS Core ProjectExplorer TextEditor PLUGIN_DEPENDS Core ProjectExplorer TextEditor
PLUGIN_TEST_DEPENDS QbsProjectManager QmakeProjectManager PLUGIN_TEST_DEPENDS QbsProjectManager QmakeProjectManager
SOURCES SOURCES

2
src/plugins/ctfvisualizer/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(CtfVisualizer add_qtc_plugin(CtfVisualizer
CONDITION TARGET Tracing CONDITION TARGET Tracing
DEPENDS Tracing Qt5::QuickWidgets DEPENDS Tracing Qt::QuickWidgets
INCLUDES ${PROJECT_SOURCE_DIR}/src INCLUDES ${PROJECT_SOURCE_DIR}/src
PLUGIN_DEPENDS Core Debugger ProjectExplorer PLUGIN_DEPENDS Core Debugger ProjectExplorer
SOURCES SOURCES

10
src/plugins/designer/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
add_qtc_plugin(Designer add_qtc_plugin(Designer
PLUGIN_CLASS FormEditorPlugin PLUGIN_CLASS FormEditorPlugin
CONDITION TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer CONDITION TARGET Qt::DesignerComponents AND TARGET Qt::Designer
DEPENDS designerintegrationv2 DEPENDS designerintegrationv2
Qt5::Designer Qt5::PrintSupport Qt5::DesignerComponents Qt::Designer Qt::PrintSupport Qt::DesignerComponents
DEFINES CPP_ENABLED DEFINES CPP_ENABLED
PLUGIN_DEPENDS Core CppEditor ProjectExplorer QtSupport ResourceEditor TextEditor PLUGIN_DEPENDS Core CppEditor ProjectExplorer QtSupport ResourceEditor TextEditor
PLUGIN_TEST_DEPENDS CppEditor PLUGIN_TEST_DEPENDS CppEditor
@@ -33,12 +33,14 @@ add_qtc_plugin(Designer
) )
extend_qtc_plugin(Designer extend_qtc_plugin(Designer
CONDITION WITH_TESTS AND TARGET Qt5::DesignerComponents AND TARGET Qt5::Designer CONDITION WITH_TESTS AND TARGET Qt::DesignerComponents AND TARGET Qt::Designer
SOURCES gotoslot_test.cpp SOURCES gotoslot_test.cpp
) )
if (QTC_STATIC_BUILD AND TARGET Designer) if (QTC_STATIC_BUILD AND TARGET Designer)
get_target_property(_designerType Qt5::Designer TYPE) # version-less target Qt::Designer is an interface library that links to QtX::Designer
get_target_property(_designer Qt::Designer INTERFACE_LINK_LIBRARIES)
get_target_property(_designerType ${_designer} TYPE)
if (${_designerType} STREQUAL "STATIC_LIBRARY") if (${_designerType} STREQUAL "STATIC_LIBRARY")
extend_qtc_target(Designer PUBLIC_DEFINES QT_DESIGNER_STATIC) extend_qtc_target(Designer PUBLIC_DEFINES QT_DESIGNER_STATIC)
endif() endif()

6
src/plugins/help/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Help add_qtc_plugin(Help
CONDITION TARGET Qt5::Help CONDITION TARGET Qt::Help
DEPENDS shared_help DEPENDS shared_help
PLUGIN_DEPENDS Core ProjectExplorer PLUGIN_DEPENDS Core ProjectExplorer
PLUGIN_RECOMMENDS TextEditor PLUGIN_RECOMMENDS TextEditor
@@ -48,9 +48,9 @@ extend_qtc_plugin(Help
option(BUILD_HELPVIEWERBACKEND_QTWEBENGINE "Build QtWebEngine based help viewer backend." YES) option(BUILD_HELPVIEWERBACKEND_QTWEBENGINE "Build QtWebEngine based help viewer backend." YES)
find_package(Qt5 COMPONENTS WebEngineWidgets QUIET) find_package(Qt5 COMPONENTS WebEngineWidgets QUIET)
extend_qtc_plugin(Help extend_qtc_plugin(Help
CONDITION BUILD_HELPVIEWERBACKEND_QTWEBENGINE AND TARGET Qt5::WebEngineWidgets CONDITION BUILD_HELPVIEWERBACKEND_QTWEBENGINE AND TARGET Qt::WebEngineWidgets
FEATURE_INFO "QtWebEngine help viewer" FEATURE_INFO "QtWebEngine help viewer"
DEPENDS Qt5::WebEngineWidgets DEPENDS Qt::WebEngineWidgets
DEFINES QTC_WEBENGINE_HELPVIEWER DEFINES QTC_WEBENGINE_HELPVIEWER
SOURCES SOURCES
webenginehelpviewer.cpp webenginehelpviewer.cpp

4
src/plugins/imageviewer/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
find_package(Qt5 COMPONENTS SvgWidgets QUIET) find_package(Qt5 COMPONENTS SvgWidgets QUIET)
if (TARGET Qt5::SvgWidgets) if (TARGET Qt::SvgWidgets)
set(SVG_WIDGETS Qt5::SvgWidgets) set(SVG_WIDGETS Qt::SvgWidgets)
endif() endif()
add_qtc_plugin(ImageViewer add_qtc_plugin(ImageViewer

2
src/plugins/ios/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Ios add_qtc_plugin(Ios
DEPENDS QmlDebug Qt5::Xml DEPENDS QmlDebug Qt::Xml
PLUGIN_DEPENDS Core Debugger ProjectExplorer QmakeProjectManager CMakeProjectManager PLUGIN_DEPENDS Core Debugger ProjectExplorer QmakeProjectManager CMakeProjectManager
SOURCES SOURCES
createsimulatordialog.cpp createsimulatordialog.h createsimulatordialog.cpp createsimulatordialog.h

2
src/plugins/languageclient/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(LanguageClient add_qtc_plugin(LanguageClient
PUBLIC_DEPENDS LanguageServerProtocol Qt5::Core app_version PUBLIC_DEPENDS LanguageServerProtocol Qt::Core app_version
PLUGIN_DEPENDS ProjectExplorer Core TextEditor PLUGIN_DEPENDS ProjectExplorer Core TextEditor
SOURCES SOURCES
client.cpp client.h client.cpp client.h

2
src/plugins/mcusupport/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(McuSupport add_qtc_plugin(McuSupport
DEPENDS Qt5::Core DEPENDS Qt::Core
PLUGIN_DEPENDS Core BareMetal ProjectExplorer Debugger CMakeProjectManager QtSupport PLUGIN_DEPENDS Core BareMetal ProjectExplorer Debugger CMakeProjectManager QtSupport
SOURCES SOURCES
mcukitinformation.cpp mcukitinformation.h mcukitinformation.cpp mcukitinformation.h

8
src/plugins/mesonprojectmanager/CMakeLists.txt
View File

@@ -92,7 +92,7 @@ add_qtc_test(tst_mesonwrapper
INCLUDES INCLUDES
BEFORE "." BEFORE "."
DEPENDS DEPENDS
Qt5::Core Qt5::Test Core Qt::Core Qt::Test Core
Utils Utils
DEFINES DEFINES
MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources"
@@ -113,7 +113,7 @@ add_qtc_test(tst_mesoninfoparser
INCLUDES INCLUDES
BEFORE "." BEFORE "."
DEPENDS DEPENDS
Qt5::Core Qt5::Test Core Qt::Core Qt::Test Core
Utils Utils
DEFINES DEFINES
MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources" MESON_SAMPLES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/resources"
@@ -134,7 +134,7 @@ add_qtc_test(tst_ninjaparser
INCLUDES INCLUDES
BEFORE "." BEFORE "."
DEPENDS DEPENDS
Qt5::Core Qt5::Test Core Qt::Core Qt::Test Core
Utils ProjectExplorer Utils ProjectExplorer
SOURCES SOURCES
tests/testninjaparser.cpp tests/testninjaparser.cpp
@@ -147,7 +147,7 @@ add_qtc_test(tst_mesonparser
DEFINES DEFINES
MESONPARSER_DISABLE_TASKS_FOR_TESTS MESONPARSER_DISABLE_TASKS_FOR_TESTS
DEPENDS DEPENDS
Qt5::Core Qt5::Test Core Qt::Core Qt::Test Core
Utils ProjectExplorer Utils ProjectExplorer
SOURCES SOURCES
tests/testmesonparser.cpp tests/testmesonparser.cpp

2
src/plugins/modeleditor/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(ModelEditor add_qtc_plugin(ModelEditor
DEPENDS Modeling Qt5::Core Qt5::Gui Qt5::Widgets DEPENDS Modeling Qt::Core Qt::Gui Qt::Widgets
PLUGIN_DEPENDS Core CppEditor ProjectExplorer PLUGIN_DEPENDS Core CppEditor ProjectExplorer
SOURCES SOURCES
actionhandler.cpp actionhandler.h actionhandler.cpp actionhandler.h

2
src/plugins/perfprofiler/CMakeLists.txt
View File

@@ -41,7 +41,7 @@ set(PERFPROFILER_CPP_SOURCES
add_qtc_plugin(PerfProfiler add_qtc_plugin(PerfProfiler
CONDITION TARGET Tracing CONDITION TARGET Tracing
DEPENDS Tracing Qt5::QuickWidgets DEPENDS Tracing Qt::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport
SOURCES SOURCES
${TEST_SOURCES} ${TEST_SOURCES}

2
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(ProjectExplorer add_qtc_plugin(ProjectExplorer
DEPENDS Qt5::Qml DEPENDS Qt::Qml
PLUGIN_DEPENDS Core TextEditor PLUGIN_DEPENDS Core TextEditor
PLUGIN_TEST_DEPENDS GenericProjectManager PLUGIN_TEST_DEPENDS GenericProjectManager
SOURCES SOURCES

2
src/plugins/qbsprojectmanager/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QbsProjectManager add_qtc_plugin(QbsProjectManager
DEPENDS Qt5::Qml Qt5::Widgets QmlJS DEPENDS Qt::Qml Qt::Widgets QmlJS
DEFINES DEFINES
IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}" IDE_LIBRARY_BASENAME="${IDE_LIBRARY_BASE_PATH}"
PLUGIN_DEPENDS Core ProjectExplorer CppEditor QtSupport QmlJSTools PLUGIN_DEPENDS Core ProjectExplorer CppEditor QtSupport QmlJSTools

24
src/plugins/qmldesigner/CMakeLists.txt
View File

@@ -1,8 +1,8 @@
add_qtc_plugin(QmlDesigner add_qtc_plugin(QmlDesigner
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt5::QuickWidgets AND TARGET Qt5::Svg CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.2.0 AND TARGET Qt::QuickWidgets AND TARGET Qt::Svg
DEPENDS DEPENDS
QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem QmlJS LanguageUtils QmlEditorWidgets AdvancedDockingSystem
Qt5::QuickWidgets Qt5::CorePrivate Sqlite Qt5::Xml Qt5::Svg Qt::QuickWidgets Qt::CorePrivate Sqlite Qt::Xml Qt::Svg
PLUGIN_DEPENDS PLUGIN_DEPENDS
Core ProjectExplorer QmlJSEditor QmlProjectManager Core ProjectExplorer QmlJSEditor QmlProjectManager
QtSupport QtSupport
@@ -29,7 +29,7 @@ add_feature_info("Build with QmlDom" ${WITH_QMLDOM} "")
add_qtc_library(QmlDesignerUtils STATIC add_qtc_library(QmlDesignerUtils STATIC
DEPENDS DEPENDS
Qt5::Gui Qt::Gui
DEFINES QMLDESIGNERUTILS_LIBRARY DEFINES QMLDESIGNERUTILS_LIBRARY
PUBLIC_DEFINES $<$<BOOL:${QTC_STATIC_BUILD}>:QMLDESIGNER_STATIC_LIBRARY> PUBLIC_DEFINES $<$<BOOL:${QTC_STATIC_BUILD}>:QMLDESIGNER_STATIC_LIBRARY>
PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/utils PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/utils
@@ -45,11 +45,11 @@ add_qtc_library(QmlDesignerUtils STATIC
add_qtc_library(QmlDesignerCore STATIC add_qtc_library(QmlDesignerCore STATIC
DEPENDS DEPENDS
Threads::Threads Threads::Threads
Qt5::CorePrivate Qt::CorePrivate
CPlusPlus CPlusPlus
Utils Utils
Qt5::Widgets Qt::Widgets
Qt5::Qml Qt::Qml
Core Core
ProjectExplorer ProjectExplorer
QmakeProjectManager QmakeProjectManager
@@ -524,17 +524,13 @@ endif()
if (QTC_STATIC_BUILD AND TARGET QmlDesigner) if (QTC_STATIC_BUILD AND TARGET QmlDesigner)
get_target_property(_designerType Qt5::Designer TYPE)
if (${_designerType} STREQUAL "STATIC_LIBRARY")
extend_qtc_target(QmlDesigner PUBLIC_DEFINES QT_DESIGNER_STATIC)
endif()
extend_qtc_target(QmlDesigner PUBLIC_DEPENDS TextEditor) extend_qtc_target(QmlDesigner PUBLIC_DEPENDS TextEditor)
endif() endif()
add_qtc_plugin(assetexporterplugin add_qtc_plugin(assetexporterplugin
PLUGIN_CLASS AssetExporterPlugin PLUGIN_CLASS AssetExporterPlugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner
DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml Qt5::QuickPrivate DEPENDS Core ProjectExplorer QmlDesigner Utils Qt::Qml Qt::QuickPrivate
PUBLIC_INCLUDES assetexporterplugin PUBLIC_INCLUDES assetexporterplugin
SOURCES SOURCES
assetexporterplugin/assetexportdialog.h assetexporterplugin/assetexportdialog.cpp assetexporterplugin/assetexportdialog.ui assetexporterplugin/assetexportdialog.h assetexporterplugin/assetexportdialog.cpp assetexporterplugin/assetexportdialog.ui
@@ -556,7 +552,7 @@ add_qtc_plugin(assetexporterplugin
add_qtc_plugin(componentsplugin add_qtc_plugin(componentsplugin
PLUGIN_CLASS ComponentsPlugin PLUGIN_CLASS ComponentsPlugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner
DEPENDS Core QmlDesigner Utils Qt5::Qml DEPENDS Core QmlDesigner Utils Qt::Qml
DEFINES COMPONENTS_LIBRARY DEFINES COMPONENTS_LIBRARY
SOURCES SOURCES
componentsplugin/addtabdesigneraction.cpp componentsplugin/addtabdesigneraction.h componentsplugin/addtabdesigneraction.cpp componentsplugin/addtabdesigneraction.h
@@ -572,7 +568,7 @@ add_qtc_plugin(componentsplugin
add_qtc_plugin(qmlpreviewplugin add_qtc_plugin(qmlpreviewplugin
PLUGIN_CLASS QmlPreviewWidgetPlugin PLUGIN_CLASS QmlPreviewWidgetPlugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner
DEPENDS Core ProjectExplorer QmlDesigner Utils Qt5::Qml DEPENDS Core ProjectExplorer QmlDesigner Utils Qt::Qml
SOURCES SOURCES
qmlpreviewplugin/qmlpreviewactions.cpp qmlpreviewplugin/qmlpreviewactions.h qmlpreviewplugin/qmlpreviewactions.cpp qmlpreviewplugin/qmlpreviewactions.h
qmlpreviewplugin/qmlpreviewplugin.cpp qmlpreviewplugin/qmlpreviewplugin.h qmlpreviewplugin/qmlpreviewplugin.cpp qmlpreviewplugin/qmlpreviewplugin.h
@@ -583,7 +579,7 @@ add_qtc_plugin(qmlpreviewplugin
add_qtc_plugin(qtquickplugin add_qtc_plugin(qtquickplugin
PLUGIN_CLASS QtQuickPlugin PLUGIN_CLASS QtQuickPlugin
CONDITION TARGET QmlDesigner CONDITION TARGET QmlDesigner
DEPENDS Core QmlDesigner Utils Qt5::Qml DEPENDS Core QmlDesigner Utils Qt::Qml
DEFINES QTQUICK_LIBRARY DEFINES QTQUICK_LIBRARY
SOURCES SOURCES
qtquickplugin/qtquickplugin.cpp qtquickplugin/qtquickplugin.h qtquickplugin/qtquickplugin.cpp qtquickplugin/qtquickplugin.h

2
src/plugins/qmlpreview/CMakeLists.txt
View File

@@ -38,7 +38,7 @@ if(TARGET Qt${QT_VERSION_MAJOR}::QmlPrivate)
) )
extend_qtc_plugin(QmlPreview extend_qtc_plugin(QmlPreview
CONDITION have_qml_debug_translation_protocol CONDITION have_qml_debug_translation_protocol
PUBLIC_DEPENDS Qt5::QmlPrivate PUBLIC_DEPENDS Qt::QmlPrivate
PUBLIC_DEFINES "FOUND_QML_DEBUG_TRANSLATION_PROTOCOL" PUBLIC_DEFINES "FOUND_QML_DEBUG_TRANSLATION_PROTOCOL"
) )
endif() endif()

2
src/plugins/qmlprofiler/CMakeLists.txt
View File

@@ -77,7 +77,7 @@ find_package(Qt6 COMPONENTS ShaderTools QUIET)
add_qtc_plugin(QmlProfiler add_qtc_plugin(QmlProfiler
CONDITION TARGET Tracing AND TARGET Qt6::ShaderTools CONDITION TARGET Tracing AND TARGET Qt6::ShaderTools
DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets DEPENDS QmlDebug QmlJS Tracing Qt::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
SOURCES SOURCES
${TEST_SOURCES} ${TEST_SOURCES}

4
src/plugins/qmlprojectmanager/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_qtc_plugin(QmlProjectManager add_qtc_plugin(QmlProjectManager
CONDITION TARGET Qt5::QuickWidgets CONDITION TARGET Qt::QuickWidgets
PLUGIN_CLASS QmlProjectPlugin PLUGIN_CLASS QmlProjectPlugin
DEPENDS QmlJS Qt5::QuickWidgets DEPENDS QmlJS Qt::QuickWidgets
PLUGIN_DEPENDS Core ProjectExplorer QtSupport PLUGIN_DEPENDS Core ProjectExplorer QtSupport
SOURCES SOURCES
fileformat/filefilteritems.cpp fileformat/filefilteritems.h fileformat/filefilteritems.cpp fileformat/filefilteritems.h

2
src/plugins/qnx/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Qnx add_qtc_plugin(Qnx
DEPENDS QmlDebug Qt5::Xml DEPENDS QmlDebug Qt::Xml
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
SOURCES SOURCES
qnx.qrc qnx.qrc

2
src/plugins/qtsupport/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(QtSupport add_qtc_plugin(QtSupport
DEPENDS Qt5::Xml DEPENDS Qt::Xml
PUBLIC_DEPENDS ProParser PUBLIC_DEPENDS ProParser
PLUGIN_DEPENDS Core ProjectExplorer ResourceEditor PLUGIN_DEPENDS Core ProjectExplorer ResourceEditor
SOURCES SOURCES

2
src/plugins/resourceeditor/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(ResourceEditor add_qtc_plugin(ResourceEditor
DEPENDS Qt5::Xml DEPENDS Qt::Xml
PLUGIN_DEPENDS Core ProjectExplorer PLUGIN_DEPENDS Core ProjectExplorer
SOURCES SOURCES
qrceditor/qrceditor.cpp qrceditor/qrceditor.h qrceditor/qrceditor.cpp qrceditor/qrceditor.h

4
src/plugins/serialterminal/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(SerialTerminal add_qtc_plugin(SerialTerminal
CONDITION TARGET Qt5::SerialPort CONDITION TARGET Qt::SerialPort
DEPENDS Qt5::SerialPort DEPENDS Qt::SerialPort
PLUGIN_DEPENDS Core TextEditor PLUGIN_DEPENDS Core TextEditor
SOURCES SOURCES
consolelineedit.cpp consolelineedit.h consolelineedit.cpp consolelineedit.h

4
src/plugins/studiowelcome/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(StudioWelcome add_qtc_plugin(StudioWelcome
CONDITION TARGET Qt5::QuickWidgets AND TARGET QmlDesigner CONDITION TARGET Qt::QuickWidgets AND TARGET QmlDesigner
DEPENDS Qt5::QuickWidgets Qt5::QmlPrivate DEPENDS Qt::QuickWidgets Qt::QmlPrivate
PLUGIN_DEPENDS Core ProjectExplorer QtSupport QmlDesigner PLUGIN_DEPENDS Core ProjectExplorer QtSupport QmlDesigner
DEFINES STUDIO_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/qml/" DEFINES STUDIO_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/qml/"
SOURCES SOURCES

2
src/plugins/texteditor/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ else()
endif() endif()
add_qtc_plugin(TextEditor add_qtc_plugin(TextEditor
DEPENDS Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::Xml DEPENDS Qt::Concurrent Qt::Network Qt::PrintSupport Qt::Xml
PUBLIC_DEPENDS ${KSYNTAXHIGHLIGHTING_TARGET} PUBLIC_DEPENDS ${KSYNTAXHIGHLIGHTING_TARGET}
PLUGIN_DEPENDS Core PLUGIN_DEPENDS Core
SOURCES SOURCES

2
src/plugins/updateinfo/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(UpdateInfo add_qtc_plugin(UpdateInfo
DEPENDS Qt5::Xml DEPENDS Qt::Xml
PLUGIN_DEPENDS Core PLUGIN_DEPENDS Core
PLUGIN_JSON_IN UPDATEINFO_EXPERIMENTAL_STR=true PLUGIN_JSON_IN UPDATEINFO_EXPERIMENTAL_STR=true
SOURCES SOURCES

2
src/plugins/webassembly/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(WebAssembly add_qtc_plugin(WebAssembly
DEPENDS Qt5::Core DEPENDS Qt::Core
PLUGIN_DEPENDS Core ProjectExplorer QtSupport PLUGIN_DEPENDS Core ProjectExplorer QtSupport
SOURCES SOURCES
webassembly.qrc webassembly.qrc

8
src/shared/designerintegrationv2/CMakeLists.txt
View File

@@ -1,9 +1,9 @@
if (NOT TARGET Qt5::Designer) if (NOT TARGET Qt::Designer)
return() return()
endif() endif()
add_qtc_library(designerintegrationv2 STATIC add_qtc_library(designerintegrationv2 STATIC
DEPENDS Qt5::Designer Qt5::Widgets DEPENDS Qt::Designer Qt::Widgets
PUBLIC_INCLUDES PUBLIC_INCLUDES
"${CMAKE_CURRENT_LIST_DIR}" "${CMAKE_CURRENT_LIST_DIR}"
SOURCES SOURCES
@@ -14,7 +14,9 @@ add_qtc_library(designerintegrationv2 STATIC
) )
if (QTC_STATIC_BUILD) if (QTC_STATIC_BUILD)
get_target_property(_designerType Qt5::Designer TYPE) # version-less target Qt::Designer is an interface library that links to QtX::Designer
get_target_property(_designer Qt::Designer INTERFACE_LINK_LIBRARIES)
get_target_property(_designerType ${_designer} TYPE)
if (${_designerType} STREQUAL "STATIC_LIBRARY") if (${_designerType} STREQUAL "STATIC_LIBRARY")
extend_qtc_target(designerintegrationv2 PUBLIC_DEFINES QT_DESIGNER_STATIC) extend_qtc_target(designerintegrationv2 PUBLIC_DEFINES QT_DESIGNER_STATIC)
endif() endif()

6
src/shared/help/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
if (NOT TARGET Qt5::Help) if (NOT TARGET Qt::Help)
# Do not built without Qt5::Help being available # Do not built without Qt::Help being available
return() return()
endif() endif()
@@ -12,7 +12,7 @@ if (isMultiConfig)
endif() endif()
add_qtc_library(shared_help STATIC add_qtc_library(shared_help STATIC
DEPENDS Utils Core PUBLIC Qt5::Help Qt5::PrintSupport Qt5::Widgets DEPENDS Utils Core PUBLIC Qt::Help Qt::PrintSupport Qt::Widgets
PUBLIC_INCLUDES PUBLIC_INCLUDES
"${PLUGIN_SOURCE_DIR}/help" "${PLUGIN_SOURCE_DIR}/help"
"${PLUGIN_SOURCE_DIR}" "${PLUGIN_SOURCE_DIR}"

2
src/shared/proparser/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_library(ProParser add_qtc_library(ProParser
DEPENDS Qt5::Core Utils DEPENDS Qt::Core Utils
PUBLIC_DEFINES PUBLIC_DEFINES
QMAKE_BUILTIN_PRFS QMAKE_OVERRIDE_PRFS QMAKE_BUILTIN_PRFS QMAKE_OVERRIDE_PRFS
PROPARSER_THREAD_SAFE PROEVALUATOR_CUMULATIVE PROEVALUATOR_DUAL_VFS PROPARSER_THREAD_SAFE PROEVALUATOR_CUMULATIVE PROEVALUATOR_DUAL_VFS

2
src/shared/qtlockedfile/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ else()
endif() endif()
add_library(shared_qtlockedfile STATIC ${OS_SOURCES} qtlockedfile.cpp qtlockedfile.h) add_library(shared_qtlockedfile STATIC ${OS_SOURCES} qtlockedfile.cpp qtlockedfile.h)
target_link_libraries(shared_qtlockedfile Qt5::Core) target_link_libraries(shared_qtlockedfile Qt::Core)
target_include_directories(shared_qtlockedfile PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(shared_qtlockedfile PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
if (WIN32) if (WIN32)
target_compile_definitions(shared_qtlockedfile PRIVATE target_compile_definitions(shared_qtlockedfile PRIVATE

2
src/shared/qtsingleapplication/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ add_library(shared_qtsingleapplication STATIC
qtsingleapplication.cpp qtsingleapplication.h qtsingleapplication.cpp qtsingleapplication.h
qtlocalpeer.cpp qtlocalpeer.h qtlocalpeer.cpp qtlocalpeer.h
) )
target_link_libraries(shared_qtsingleapplication shared_qtlockedfile Qt5::Core Qt5::Network Qt5::Widgets) target_link_libraries(shared_qtsingleapplication shared_qtlockedfile Qt::Core Qt::Network Qt::Widgets)
target_include_directories(shared_qtsingleapplication PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(shared_qtsingleapplication PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
if (WIN32) if (WIN32)
target_compile_definitions(shared_qtsingleapplication PRIVATE "QT_QTSINGLEAPPLICATION_EXPORT=__declspec(dllexport)") target_compile_definitions(shared_qtsingleapplication PRIVATE "QT_QTSINGLEAPPLICATION_EXPORT=__declspec(dllexport)")

2
src/shared/registryaccess/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
if (WIN32) if (WIN32)
add_library(registryaccess STATIC registryaccess.cpp registryaccess.h) add_library(registryaccess STATIC registryaccess.cpp registryaccess.h)
target_link_libraries(registryaccess PUBLIC advapi32 ole32 shell32 Qt5::Widgets) target_link_libraries(registryaccess PUBLIC advapi32 ole32 shell32 Qt::Widgets)
target_compile_definitions(registryaccess PRIVATE _UNICODE UNICODE) target_compile_definitions(registryaccess PRIVATE _UNICODE UNICODE)
target_include_directories(registryaccess PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(registryaccess PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
else() else()

2
src/tools/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ function(add_qtc_cpp_tool name)
DEFINES DEFINES
PATH_PREPROCESSOR_CONFIG=\"${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared/pp-configuration.inc\" PATH_PREPROCESSOR_CONFIG=\"${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared/pp-configuration.inc\"
${ARGN} ${ARGN}
DEPENDS CPlusPlus Utils Qt5::Widgets DEPENDS CPlusPlus Utils Qt::Widgets
INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared" INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cplusplus-shared"
"${CMAKE_CURRENT_SOURCE_DIR}/${name}" "${CMAKE_CURRENT_SOURCE_DIR}/${name}"
SOURCES SOURCES

6
src/tools/iostool/CMakeLists.txt
View File

@@ -1,9 +1,9 @@
add_qtc_executable(iostool add_qtc_executable(iostool
DESTINATION ${IDE_LIBEXEC_PATH}/ios DESTINATION ${IDE_LIBEXEC_PATH}/ios
DEPENDS DEPENDS
Qt5::Core Qt::Core
Qt5::Xml Qt::Xml
Qt5::Network Qt::Network
${FWCoreFoundation} ${FWCoreFoundation}
${FWCoreServices} ${FWCoreServices}
${FWIOKit} ${FWIOKit}

2
src/tools/processlauncher/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ set(UTILSDIR "${PROJECT_SOURCE_DIR}/src/libs/utils")
add_qtc_executable(qtcreator_processlauncher add_qtc_executable(qtcreator_processlauncher
INCLUDES "${UTILSDIR}" INCLUDES "${UTILSDIR}"
DEPENDS Qt5::Core Qt5::Network DEPENDS Qt::Core Qt::Network
DEFINES UTILS_STATIC_LIBRARY DEFINES UTILS_STATIC_LIBRARY
SOURCES SOURCES
launcherlogging.cpp launcherlogging.cpp

22
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -31,10 +31,10 @@ endif()
add_qtc_executable(qml2puppet add_qtc_executable(qml2puppet
${DESTINATION} ${DESTINATION}
CONDITION TARGET Qt5::Quick CONDITION TARGET Qt::Quick
DEPENDS DEPENDS
Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate Qt::CorePrivate Qt::Widgets Qt::QmlPrivate
Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate Qt::QuickPrivate Qt::Network Qt::GuiPrivate
QmlPuppetCommunication QmlPuppetCommunication
INCLUDES INCLUDES
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
@@ -89,9 +89,9 @@ extend_qtc_executable(qml2puppet
find_package(Qt5 5.15.0 COMPONENTS Quick3D QUIET) find_package(Qt5 5.15.0 COMPONENTS Quick3D QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt5::Quick3D CONDITION TARGET Qt::Quick3D
FEATURE_INFO "Qt Quick 3D support" FEATURE_INFO "Qt Quick 3D support"
DEPENDS Qt5::Quick3D Qt5::Quick3DPrivate DEPENDS Qt::Quick3D Qt::Quick3DPrivate
DEFINES QUICK3D_MODULE DEFINES QUICK3D_MODULE
SOURCES_PREFIX qml2puppet/editor3d SOURCES_PREFIX qml2puppet/editor3d
@@ -109,26 +109,26 @@ extend_qtc_executable(qml2puppet
find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetImport QUIET) find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetImport QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt5::Quick3DAssetImport CONDITION TARGET Qt::Quick3DAssetImport
FEATURE_INFO "Qt Quick 3D asset import" FEATURE_INFO "Qt Quick 3D asset import"
DEPENDS Qt5::Quick3DAssetImportPrivate DEPENDS Qt::Quick3DAssetImportPrivate
DEFINES IMPORT_QUICK3D_ASSETS DEFINES IMPORT_QUICK3D_ASSETS
) )
find_package(Qt5 5.15.0 COMPONENTS Quick3DParticles QUIET) find_package(Qt5 5.15.0 COMPONENTS Quick3DParticles QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt5::Quick3DParticles CONDITION TARGET Qt::Quick3DParticles
FEATURE_INFO "Qt Quick 3D particles" FEATURE_INFO "Qt Quick 3D particles"
DEPENDS Qt5::Quick3DParticles Qt5::Quick3DParticlesPrivate DEPENDS Qt::Quick3DParticles Qt::Quick3DParticlesPrivate
DEFINES QUICK3D_PARTICLES_MODULE DEFINES QUICK3D_PARTICLES_MODULE
) )
# Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work # Quick3DAssetUtils optionally depends on QuickTimeline, so find also it to make the CI build work
find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET) find_package(Qt5 5.15.0 COMPONENTS Quick3DAssetUtils QuickTimeline QUIET)
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION TARGET Qt5::Quick3DAssetUtils CONDITION TARGET Qt::Quick3DAssetUtils
FEATURE_INFO "Qt Quick 3D asset utils" FEATURE_INFO "Qt Quick 3D asset utils"
DEPENDS Qt5::Quick3DAssetUtilsPrivate DEPENDS Qt::Quick3DAssetUtilsPrivate
DEFINES QUICK3D_ASSET_UTILS_MODULE DEFINES QUICK3D_ASSET_UTILS_MODULE
) )

2
src/tools/qtc-askpass/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_executable(qtc-askpass add_qtc_executable(qtc-askpass
DEPENDS Qt5::Widgets DEPENDS Qt::Widgets
SOURCES SOURCES
qtc-askpass-main.cpp qtc-askpass-main.cpp
) )

2
src/tools/qtcdebugger/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ if (NOT WIN32)
endif() endif()
add_qtc_executable(qtcdebugger add_qtc_executable(qtcdebugger
DEPENDS Qt5::Widgets registryaccess psapi app_version DEPENDS Qt::Widgets registryaccess psapi app_version
SOURCES SOURCES
main.cpp main.cpp
PROPERTIES WIN32_EXECUTABLE ON PROPERTIES WIN32_EXECUTABLE ON

2
src/tools/qtcreatorcrashhandler/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_executable(qtcreator_crash_handler add_qtc_executable(qtcreator_crash_handler
CONDITION UNIX AND NOT APPLE AND (CMAKE_BUILD_TYPE STREQUAL "Debug") CONDITION UNIX AND NOT APPLE AND (CMAKE_BUILD_TYPE STREQUAL "Debug")
DEPENDS app_version Utils Qt5::Widgets DEPENDS app_version Utils Qt::Widgets
SOURCES SOURCES
backtracecollector.cpp backtracecollector.h backtracecollector.cpp backtracecollector.h
crashhandler.cpp crashhandler.h crashhandler.cpp crashhandler.h

2
src/tools/qtpromaker/CMakeLists.txt
View File

@@ -1 +1 @@
add_qtc_executable(qtpromaker DEPENDS Qt5::Core SOURCES main.cpp) add_qtc_executable(qtpromaker DEPENDS Qt::Core SOURCES main.cpp)

2
src/tools/sdktool/CMakeLists.txt
View File

@@ -36,7 +36,7 @@ file(RELATIVE_PATH DATA_PATH "/${IDE_LIBEXEC_PATH}" "/${IDE_DATA_PATH}")
add_qtc_library(sdktoolLib add_qtc_library(sdktoolLib
STATIC STATIC
DEFINES DATA_PATH=\"${DATA_PATH}\" DEFINES DATA_PATH=\"${DATA_PATH}\"
PUBLIC_DEPENDS Qt5::Core PUBLIC_DEPENDS Qt::Core
PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} "${UtilsSourcesDir}/../" PUBLIC_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} "${UtilsSourcesDir}/../"
INCLUDES INCLUDES
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}

2
src/tools/valgrindfake/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_executable(valgrind-fake add_qtc_executable(valgrind-fake
SKIP_INSTALL SKIP_INSTALL
DEPENDS Qt5::Network Qt5::Xml DEPENDS Qt::Network Qt::Xml
SOURCES main.cpp outputgenerator.cpp outputgenerator.h SOURCES main.cpp outputgenerator.cpp outputgenerator.h
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )

2
tests/auto/aggregation/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_aggregation add_qtc_test(tst_aggregation
DEPENDS Aggregation Qt5::Core DEPENDS Aggregation Qt::Core
SOURCES tst_aggregate.cpp SOURCES tst_aggregate.cpp
) )

12
tests/auto/debugger/CMakeLists.txt
View File

@@ -20,7 +20,7 @@ if (NOT QT_CREATOR_API_DEFINED)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(IMPLICIT_DEPENDS Qt5::Test) set(IMPLICIT_DEPENDS Qt::Test)
include(QtCreatorIDEBranding) include(QtCreatorIDEBranding)
include(QtCreatorAPI) include(QtCreatorAPI)
@@ -46,12 +46,12 @@ add_qtc_test(tst_debugger_disassembler
option(WITH_DEBUGGER_DUMPERS "Include tests for debugger pretty printers" ON) option(WITH_DEBUGGER_DUMPERS "Include tests for debugger pretty printers" ON)
if (WITH_DEBUGGER_DUMPERS) if (WITH_DEBUGGER_DUMPERS)
get_target_property(qmake_binary Qt5::qmake IMPORTED_LOCATION) get_target_property(qmake_binary Qt::qmake IMPORTED_LOCATION)
add_qtc_test(tst_debugger_dumpers add_qtc_test(tst_debugger_dumpers
EXCLUDE_FROM_PRECHECK EXCLUDE_FROM_PRECHECK
TIMEOUT 0 TIMEOUT 0
DEPENDS Qt5::Network Utils DEPENDS Qt::Network Utils
DEFINES DEFINES
DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger" DUMPERDIR="${PROJECT_SOURCE_DIR}/share/qtcreator/debugger"
DEFAULT_QMAKE_BINARY="${qmake_binary}" DEFAULT_QMAKE_BINARY="${qmake_binary}"
@@ -68,7 +68,7 @@ if (WITH_DEBUGGER_DUMPERS)
endif() endif()
add_qtc_test(tst_debugger_gdb add_qtc_test(tst_debugger_gdb
DEPENDS Qt5::Network Utils DEPENDS Qt::Network Utils
INCLUDES "${DEBUGGERDIR}" INCLUDES "${DEBUGGERDIR}"
SOURCES SOURCES
tst_gdb.cpp tst_gdb.cpp
@@ -77,7 +77,7 @@ add_qtc_test(tst_debugger_gdb
) )
add_qtc_test(tst_debugger_protocol add_qtc_test(tst_debugger_protocol
DEPENDS Qt5::Network Utils DEPENDS Qt::Network Utils
INCLUDES INCLUDES
"${DEBUGGERDIR}" "${DEBUGGERDIR}"
SOURCES SOURCES
@@ -87,7 +87,7 @@ add_qtc_test(tst_debugger_protocol
) )
add_qtc_test(tst_debugger_offsets add_qtc_test(tst_debugger_offsets
DEPENDS Qt5::CorePrivate DEPENDS Qt::CorePrivate
INCLUDES "${DEBUGGERDIR}" INCLUDES "${DEBUGGERDIR}"
SOURCES tst_offsets.cpp SOURCES tst_offsets.cpp
) )

4
tests/auto/qml/qmldesigner/coretests/CMakeLists.txt
View File

@@ -4,8 +4,8 @@ add_qtc_test(tst_qml_testcore
DEPENDS DEPENDS
Sqlite Sqlite
QmlDesignerCore QmlDesignerCore
Qt5::Widgets Qt::Widgets
Qt5::Qml Qt::Qml
DEFINES DEFINES
QT_CREATOR QT_CREATOR
IDE_PLUGIN_PATH="${PROJECT_BINARY_DIR}/${IDE_PLUGIN_PATH}" IDE_PLUGIN_PATH="${PROJECT_BINARY_DIR}/${IDE_PLUGIN_PATH}"

2
tests/auto/tracing/flamegraph/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_flamegraph add_qtc_test(tst_tracing_flamegraph
DEPENDS Tracing Qt5::Quick DEPENDS Tracing Qt::Quick
SOURCES tst_flamegraph.cpp SOURCES tst_flamegraph.cpp
) )

2
tests/auto/tracing/flamegraphview/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ set(TSTFLAMEGRAPHVIEW_CPP_SOURCES
add_qtc_test(tst_tracing_flamegraphview add_qtc_test(tst_tracing_flamegraphview
EXCLUDE_FROM_PRECHECK EXCLUDE_FROM_PRECHECK
DEPENDS Tracing Qt5::QuickWidgets Qt5::Quick Utils DEPENDS Tracing Qt::QuickWidgets Qt::Quick Utils
) )
if (NOT TARGET tst_tracing_flamegraphview) # qt_add_qml_module has no DEPENDS check if (NOT TARGET tst_tracing_flamegraphview) # qt_add_qml_module has no DEPENDS check

2
tests/auto/tracing/timelineabstractrenderer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelineabstractrenderer add_qtc_test(tst_tracing_timelineabstractrenderer
DEPENDS Tracing Qt5::Gui Qt5::Quick DEPENDS Tracing Qt::Gui Qt::Quick
SOURCES tst_timelineabstractrenderer.cpp SOURCES tst_timelineabstractrenderer.cpp
) )

2
tests/auto/tracing/timelineitemsrenderpass/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelineitemsrenderpass add_qtc_test(tst_tracing_timelineitemsrenderpass
DEPENDS Tracing Qt5::Quick DEPENDS Tracing Qt::Quick
SOURCES tst_timelineitemsrenderpass.cpp SOURCES tst_timelineitemsrenderpass.cpp
) )

2
tests/auto/tracing/timelinemodel/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinemodel add_qtc_test(tst_tracing_timelinemodel
DEPENDS Tracing Qt5::Gui DEPENDS Tracing Qt::Gui
SOURCES tst_timelinemodel.cpp SOURCES tst_timelinemodel.cpp
) )

2
tests/auto/tracing/timelinemodelaggregator/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinemodelaggregator add_qtc_test(tst_tracing_timelinemodelaggregator
DEPENDS Tracing Qt5::Gui DEPENDS Tracing Qt::Gui
SOURCES tst_timelinemodelaggregator.cpp SOURCES tst_timelinemodelaggregator.cpp
) )

2
tests/auto/tracing/timelinenotesmodel/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinenotesmodel add_qtc_test(tst_tracing_timelinenotesmodel
DEPENDS Tracing Qt5::Gui DEPENDS Tracing Qt::Gui
SOURCES tst_timelinenotesmodel.cpp SOURCES tst_timelinenotesmodel.cpp
) )

2
tests/auto/tracing/timelinenotesrenderpass/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinenotesrenderpass add_qtc_test(tst_tracing_timelinenotesrenderpass
DEPENDS Tracing Qt5::Quick DEPENDS Tracing Qt::Quick
SOURCES tst_timelinenotesrenderpass.cpp SOURCES tst_timelinenotesrenderpass.cpp
) )

2
tests/auto/tracing/timelineoverviewrenderer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelineoverviewrenderer add_qtc_test(tst_tracing_timelineoverviewrenderer
DEPENDS Tracing Qt5::Quick DEPENDS Tracing Qt::Quick
SOURCES tst_timelineoverviewrenderer.cpp SOURCES tst_timelineoverviewrenderer.cpp
) )

2
tests/auto/tracing/timelinerenderer/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_tracing_timelinerenderer add_qtc_test(tst_tracing_timelinerenderer
EXCLUDE_FROM_PRECHECK EXCLUDE_FROM_PRECHECK
DEPENDS Tracing Qt5::Gui Qt5::Quick DEPENDS Tracing Qt::Gui Qt::Quick
SOURCES tst_timelinerenderer.cpp SOURCES tst_timelinerenderer.cpp
) )

2
tests/auto/tracing/timelinerenderstate/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinerenderstate add_qtc_test(tst_tracing_timelinerenderstate
DEPENDS Tracing Qt5::Gui Qt5::Quick DEPENDS Tracing Qt::Gui Qt::Quick
SOURCES tst_timelinerenderstate.cpp SOURCES tst_timelinerenderstate.cpp
) )

2
tests/auto/tracing/timelineselectionrenderpass/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelineselectionrenderpass add_qtc_test(tst_tracing_timelineselectionrenderpass
DEPENDS Tracing Qt5::Quick DEPENDS Tracing Qt::Quick
SOURCES tst_timelineselectionrenderpass.cpp SOURCES tst_timelineselectionrenderpass.cpp
) )

2
tests/auto/tracing/timelinezoomcontrol/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_test(tst_tracing_timelinezoomcontrol add_qtc_test(tst_tracing_timelinezoomcontrol
DEPENDS Tracing Qt5::Gui DEPENDS Tracing Qt::Gui
SOURCES tst_timelinezoomcontrol.cpp SOURCES tst_timelinezoomcontrol.cpp
) )

2
tests/auto/updateinfo/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_test(tst_updateinfo add_qtc_test(tst_updateinfo
INCLUDES ${PROJECT_SOURCE_DIR}/src/plugins INCLUDES ${PROJECT_SOURCE_DIR}/src/plugins
DEPENDS Utils Qt5::Xml DEPENDS Utils Qt::Xml
SOURCES tst_updateinfo.cpp SOURCES tst_updateinfo.cpp
) )

2
tests/auto/valgrind/callgrind/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
include(../valgrind.cmake) include(../valgrind.cmake)
add_qtc_test(tst_callgrindparsertests add_qtc_test(tst_callgrindparsertests
DEPENDS Utils Core ProjectExplorer Debugger Qt5::Core Qt5::Network DEPENDS Utils Core ProjectExplorer Debugger Qt::Core Qt::Network
DEFINES DEFINES
PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data" PARSERTESTS_DATA_DIR="${CMAKE_CURRENT_LIST_DIR}/data"
CALLGRINDPARSERTESTS CALLGRINDPARSERTESTS

2
tests/auto/valgrind/memcheck/testapps/leak1/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
include(../testapp.cmake) include(../testapp.cmake)
add_valgrind_testapp(leak1) add_valgrind_testapp(leak1)
target_link_libraries(leak1 PRIVATE Qt5::Core) target_link_libraries(leak1 PRIVATE Qt::Core)

2
tests/auto/valgrind/memcheck/testapps/leak4/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include(../testapp.cmake) include(../testapp.cmake)
add_valgrind_testapp(leak4) add_valgrind_testapp(leak4)
target_link_libraries(leak4 PRIVATE Qt5::Core) target_link_libraries(leak4 PRIVATE Qt::Core)

2
tests/manual/proparser/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_test(tst_manual_proparser add_qtc_test(tst_manual_proparser
MANUALTEST MANUALTEST
DEPENDS Qt5::Core Qt5::Core5Compat DEPENDS Qt::Core Qt::Core5Compat
DEFINES DEFINES
"QMAKE_BUILTIN_PRFS" "QMAKE_BUILTIN_PRFS"
"QT_NO_CAST_TO_ASCII" "QT_NO_CAST_TO_ASCII"

2
tests/manual/widgets/crumblepath/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_test(tst_manual_widgets_crumblepath add_qtc_test(tst_manual_widgets_crumblepath
MANUALTEST MANUALTEST
DEPENDS Qt5::Gui Utils Core DEPENDS Qt::Gui Utils Core
SOURCES SOURCES
tst_manual_widgets_crumblepath.cpp tst_manual_widgets_crumblepath.cpp
../common/themeselector.cpp ../common/themeselector.h ../common/themeselector.cpp ../common/themeselector.h

2
tests/manual/widgets/infolabel/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_test(tst_manual_widgets_infolabel add_qtc_test(tst_manual_widgets_infolabel
MANUALTEST MANUALTEST
DEPENDS Qt5::Gui Utils Core DEPENDS Qt::Gui Utils Core
SOURCES SOURCES
tst_manual_widgets_infolabel.cpp tst_manual_widgets_infolabel.cpp
../common/themeselector.cpp ../common/themeselector.h ../common/themeselector.cpp ../common/themeselector.h

2
tests/manual/widgets/layoutbuilder/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_test(tst_manual_widgets_layoutbuilder add_qtc_test(tst_manual_widgets_layoutbuilder
MANUALTEST MANUALTEST
DEPENDS Qt5::Gui Utils Core DEPENDS Qt::Gui Utils Core
SOURCES SOURCES
tst_manual_widgets_layoutbuilder.cpp tst_manual_widgets_layoutbuilder.cpp
) )

Some files were not shown because too many files have changed in this diff Show More