1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Regenerate projects after .pro files were modified

Browse Source 
Change-Id: If6aec596bf68b209b42e0728dd6857eec8c261be
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2020-04-03 11:23:09 +02:00
parent 8a0a31ed68
commit 708d365a64
7 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/concurrent/CMakeLists.txt
View File

@ -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

22
src/gui/.prev_CMakeLists.txt
View File

@ -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

18
src/gui/CMakeLists.txt
View File

@ -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

7
src/testlib/.prev_CMakeLists.txt
View File

@ -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:<TRUE>:

4
src/testlib/CMakeLists.txt
View File

@ -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:<TRUE>:

15
src/widgets/.prev_CMakeLists.txt
View File

@ -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

6
tests/auto/concurrent/qtconcurrenttask/CMakeLists.txt
View File

@ -1,3 +1,9 @@
# Generated from qtconcurrenttask.pro.
#####################################################################
## tst_qtconcurrenttask Test:
#####################################################################
add_qt_test(tst_qtconcurrenttask
SOURCES
tst_qtconcurrenttask.cpp