Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227

1 files changed, 5 insertions, 1 deletions

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 95ee3bed65..5532f7387d 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/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
@@ -314,6 +313,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