From 3b756bdcf52a33c33f5b7aa573912bb6bd70efbe Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Date: Sun, 26 May 2019 00:28:46 +0900
Subject: Fix build without feature.label

Change-Id: Ibe4d31d441ff691c4b354dde546e403653564ba4
Reviewed-by: David Faure <david.faure@kdab.com>
---
 src/widgets/kernel/kernel.pri   | 7 +++++--
 src/widgets/kernel/qtooltip.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index c2f6e4ce75..a4b81335c5 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -23,7 +23,6 @@ HEADERS += \
         kernel/qshortcut.h \
 	kernel/qsizepolicy.h \
         kernel/qstackedlayout.h \
-	kernel/qtooltip.h \
         kernel/qwidget.h \
         kernel/qwidget_p.h \
 	kernel/qwidgetaction.h \
@@ -51,7 +50,6 @@ SOURCES += \
         kernel/qshortcut.cpp \
         kernel/qsizepolicy.cpp \
         kernel/qstackedlayout.cpp \
-	kernel/qtooltip.cpp \
 	kernel/qwidget.cpp \
 	kernel/qwidgetaction.cpp \
 	kernel/qgesture.cpp \
@@ -79,6 +77,11 @@ qtConfig(formlayout) {
     SOURCES += kernel/qformlayout.cpp
 }
 
+qtConfig(tooltip) {
+    HEADERS += kernel/qtooltip.h
+    SOURCES += kernel/qtooltip.cpp
+}
+
 qtConfig(whatsthis) {
     HEADERS += kernel/qwhatsthis.h
     SOURCES += kernel/qwhatsthis.cpp
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index f81cb471fa..d030a28356 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -41,7 +41,6 @@
 #endif
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include <QtWidgets/private/qlabel_p.h>
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -61,6 +60,7 @@
 
 #ifndef QT_NO_TOOLTIP
 #include <qlabel.h>
+#include <QtWidgets/private/qlabel_p.h>
 #include <qtooltip.h>
 
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
-- 
cgit v1.2.3