From 708d365a64ee05dffa04db2ad308d79a17db4a68 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 3 Apr 2020 11:23:09 +0200 Subject: CMake: Regenerate projects after .pro files were modified Change-Id: If6aec596bf68b209b42e0728dd6857eec8c261be Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- src/concurrent/CMakeLists.txt | 4 ++-- src/gui/.prev_CMakeLists.txt | 22 ++++++++++++++++------ src/gui/CMakeLists.txt | 18 ++++++++++++++---- src/testlib/.prev_CMakeLists.txt | 7 ------- src/testlib/CMakeLists.txt | 4 ---- src/widgets/.prev_CMakeLists.txt | 15 ++------------- 6 files changed, 34 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index b5674d1f94..23208b253e 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -7,6 +7,7 @@ qt_add_module(Concurrent EXCEPTIONS SOURCES + qtaskbuilder.h qtconcurrent_global.h qtconcurrentcompilertest.h qtconcurrentexception.h @@ -21,9 +22,8 @@ qt_add_module(Concurrent qtconcurrentrun.cpp qtconcurrentrun.h qtconcurrentrunbase.h qtconcurrentstoredfunctioncall.h - qtconcurrentthreadengine.cpp qtconcurrentthreadengine.h - qtaskbuilder.h qtconcurrenttask.h + qtconcurrentthreadengine.cpp qtconcurrentthreadengine.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index bd066e833f..7754f19d49 100644 --- a/src/gui/.prev_CMakeLists.txt +++ b/src/gui/.prev_CMakeLists.txt @@ -364,8 +364,8 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility qt_extend_target(Gui CONDITION QT_FEATURE_action SOURCES - kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h - kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h + kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h + kernel/qactiongroup.cpp kernel/qactiongroup.h kernel/qactiongroup_p.h ) qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop @@ -379,8 +379,8 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop qt_extend_target(Gui CONDITION QT_FEATURE_shortcut SOURCES - kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h + kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h ) @@ -559,6 +559,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression util/qshadergenerator.cpp util/qshadergenerator_p.h ) +qt_extend_target(Gui CONDITION QT_FEATURE_undocommand + SOURCES + util/qundostack.cpp util/qundostack.h util/qundostack_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_undogroup + SOURCES + util/qundogroup.cpp util/qundogroup.h +) + qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h @@ -606,7 +616,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" @@ -622,10 +632,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 86:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index efa7b1c41f..597c10a74e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -465,8 +465,8 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop qt_extend_target(Gui CONDITION QT_FEATURE_shortcut SOURCES - kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h + kernel/qshortcut.cpp kernel/qshortcut.h kernel/qshortcut_p.h kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h ) @@ -664,6 +664,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_regularexpression util/qshadergenerator.cpp util/qshadergenerator_p.h ) +qt_extend_target(Gui CONDITION QT_FEATURE_undocommand + SOURCES + util/qundostack.cpp util/qundostack.h util/qundostack_p.h +) + +qt_extend_target(Gui CONDITION QT_FEATURE_undogroup + SOURCES + util/qundogroup.cpp util/qundogroup.h +) + qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h @@ -711,7 +721,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) -#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: +#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen: # special case begin # We must always generate syncqt-injected header files, # because we added a custom command earlier for those for framework builds. @@ -767,10 +777,10 @@ add_custom_command( # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" -#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: +#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan: # qvkgen_h.variable_out = "HEADERS" -#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else: +#### Keys ignored in scope 86:.:vulkan:vulkan/vulkan.pri:else: # qvkgen_h.CONFIG = "target_predeps" "no_link" qt_extend_target(Gui CONDITION WASM diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index a56048240a..2eef3edbef 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -61,13 +61,6 @@ qt_add_module(Test Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate - COMPILE_OPTIONS - --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/* - --cs-include-file-abs-wildcard=*/src/testlib/* - --cs-mcc - --cs-mcdc - LINK_OPTIONS - "$$COVERAGE_OPTIONS" ) #### Keys ignored in scope 1:.:.:testlib.pro:: diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index ba3f861549..22ac94f764 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -66,10 +66,6 @@ qt_add_module(Test Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate - # special case begin - # remove COMPILE_OPTIONS, LINK_OPTIONS, COVERAGE_OPTIONS - # figure out how it should be handled. - # special case end ) #### Keys ignored in scope 1:.:.:testlib.pro:: diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index df76fe30c2..daa9084827 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -321,8 +321,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect qt_extend_target(Widgets CONDITION QT_FEATURE_action SOURCES - kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h - kernel/qactiongroup.cpp kernel/qactiongroup.h + kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h ) @@ -333,7 +332,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut SOURCES - kernel/qshortcut.cpp kernel/qshortcut.h + kernel/qshortcut_widgets.cpp ) qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip @@ -795,16 +794,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_scroller util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h ) -qt_extend_target(Widgets CONDITION QT_FEATURE_undocommand - SOURCES - util/qundostack.cpp util/qundostack.h util/qundostack_p.h -) - -qt_extend_target(Widgets CONDITION QT_FEATURE_undogroup - SOURCES - util/qundogroup.cpp util/qundogroup.h -) - qt_extend_target(Widgets CONDITION QT_FEATURE_undoview SOURCES util/qundoview.cpp util/qundoview.h -- cgit v1.2.3