diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:26:34 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:51:20 +0200 |
commit | 5591e821358b9111c79336a66eac4d04bb5811ba (patch) | |
tree | 4b4c1da4f5ccaead1cf4f487622de1d0b242b0b9 /src/widgets/.prev_CMakeLists.txt | |
parent | e4079eca49adce16e31dac2a18d49d7a55817891 (diff) | |
parent | ca0c9f82cbf7c8c37acdcbdfdc3fa0c5fc138059 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227
Diffstat (limited to 'src/widgets/.prev_CMakeLists.txt')
-rw-r--r-- | src/widgets/.prev_CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 44f4d5de10..6d4691d8f8 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -25,7 +25,6 @@ add_qt_module(Widgets kernel/qstackedlayout.cpp kernel/qstackedlayout.h kernel/qstandardgestures.cpp kernel/qstandardgestures_p.h kernel/qtestsupport_widgets.cpp kernel/qtestsupport_widgets.h - kernel/qtooltip.cpp kernel/qtooltip.h kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h @@ -310,6 +309,11 @@ extend_target(Widgets CONDITION QT_FEATURE_formlayout kernel/qformlayout.cpp kernel/qformlayout.h ) +extend_target(Widgets CONDITION QT_FEATURE_tooltip + SOURCES + kernel/qtooltip.cpp kernel/qtooltip.h +) + extend_target(Widgets CONDITION QT_FEATURE_whatsthis SOURCES kernel/qwhatsthis.cpp kernel/qwhatsthis.h |