summaryrefslogtreecommitdiffstats
path: root/src/widgets/CMakeLists.txt
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-15 14:23:10 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-20 19:27:04 +0200
commitf1af51fd81dbdf3ada208398c517c76bab9a9489 (patch)
tree01bac2d206244af2c2f05b90b86d37da4341f345 /src/widgets/CMakeLists.txt
parent301ed73487336677a055a60787c2f2f145bdc5d2 (diff)
Add forwarding headers for classes moved from QtWidgets to QtGui
The QT_BEGIN_NAMESPACE QT_END_NAMESPACE block is added to avoid warnings from the build system's sanity check. As a drive-by, fix the include guards in the QtGui/QActionGroup header. Change-Id: Ie10e7830c3b00a3548123f58498def49b194c7aa Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets/CMakeLists.txt')
-rw-r--r--src/widgets/CMakeLists.txt18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index e1e7dd968a..afc1aa6753 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -321,6 +321,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
SOURCES
+ kernel/qaction.h kernel/qactiongroup.h
kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
)
@@ -332,7 +333,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
SOURCES
- kernel/qshortcut_widgets.cpp
+ kernel/qshortcut.h kernel/qshortcut_widgets.cpp
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
@@ -621,6 +622,11 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog
uic
)
+qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel
+ SOURCES
+ dialogs/qfilesystemmodel.h
+)
+
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
SOURCES
dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
@@ -783,6 +789,16 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
)
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
+ SOURCES
+ util/qundostack.h
+)
+
+qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
+ SOURCES
+ util/qundogroup.h
+)
+
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview
SOURCES
util/qundoview.cpp util/qundoview.h