diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-03 11:23:09 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-03 16:05:29 +0200 |
commit | 708d365a64ee05dffa04db2ad308d79a17db4a68 (patch) | |
tree | 116a9d9b39a4393846c53feb70ef5025cefe37b8 /src/gui/.prev_CMakeLists.txt | |
parent | 8a0a31ed682a95cb6fe231c9d6f06d8fb57d33b0 (diff) |
CMake: Regenerate projects after .pro files were modified
Change-Id: If6aec596bf68b209b42e0728dd6857eec8c261be
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/.prev_CMakeLists.txt')
-rw-r--r-- | src/gui/.prev_CMakeLists.txt | 22 |
1 files changed, 16 insertions, 6 deletions
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 |