From dc2512f3088d6f836ef06d35cbf1a5f7acb4ce7b Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Thu, 2 Mar 2017 13:39:22 +0100
Subject: Add feature.label and feature.formlayout

Change-Id: Ic8dc0aee7f3fc0d8218ba709352b1378078c6070
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/kernel/kernel.pri    | 7 +++++--
 src/widgets/kernel/qformlayout.h | 2 ++
 src/widgets/kernel/qlayout.cpp   | 6 ++++++
 src/widgets/kernel/qtooltip.cpp  | 5 +++--
 4 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/widgets/kernel')

diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index ad2180bbfd..c91be918b6 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -15,7 +15,6 @@ HEADERS += \
         kernel/qwidgetbackingstore_p.h \
 	kernel/qboxlayout.h \
 	kernel/qdesktopwidget.h \
-	kernel/qformlayout.h \
 	kernel/qgridlayout.h \
         kernel/qlayout.h \
 	kernel/qlayout_p.h \
@@ -45,7 +44,6 @@ SOURCES += \
 	kernel/qapplication.cpp \
         kernel/qwidgetbackingstore.cpp \
         kernel/qboxlayout.cpp \
-	kernel/qformlayout.cpp \
 	kernel/qgridlayout.cpp \
         kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
@@ -84,3 +82,8 @@ qtConfig(opengl) {
     HEADERS += kernel/qopenglwidget.h
     SOURCES += kernel/qopenglwidget.cpp
 }
+
+qtConfig(formlayout) {
+    HEADERS += kernel/qformlayout.h
+    SOURCES += kernel/qformlayout.cpp
+}
diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h
index b4185374fd..5ec27433d3 100644
--- a/src/widgets/kernel/qformlayout.h
+++ b/src/widgets/kernel/qformlayout.h
@@ -43,6 +43,8 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/QLayout>
 
+QT_REQUIRE_CONFIG(formlayout);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 1a341d155b..b90be2b4f1 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -49,7 +49,9 @@
 #include "qvariant.h"
 #include "qwidget_p.h"
 #include "qlayout_p.h"
+#if QT_CONFIG(formlayout)
 #include "qformlayout.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -320,8 +322,10 @@ int QLayout::spacing() const
         return boxlayout->spacing();
     } else if (const QGridLayout* gridlayout = qobject_cast<const QGridLayout*>(this)) {
         return gridlayout->spacing();
+#if QT_CONFIG(formlayout)
     } else if (const QFormLayout* formlayout = qobject_cast<const QFormLayout*>(this)) {
         return formlayout->spacing();
+#endif
     } else {
         Q_D(const QLayout);
         if (d->insideSpacing >=0) {
@@ -347,8 +351,10 @@ void QLayout::setSpacing(int spacing)
         boxlayout->setSpacing(spacing);
     } else if (QGridLayout* gridlayout = qobject_cast<QGridLayout*>(this)) {
         gridlayout->setSpacing(spacing);
+#if QT_CONFIG(formlayout)
     } else if (QFormLayout* formlayout = qobject_cast<QFormLayout*>(this)) {
         formlayout->setSpacing(spacing);
+#endif
     } else {
         Q_D(QLayout);
         d->insideSpacing = spacing;
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index a92dc2cbf7..48afeb1dcc 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -43,18 +43,19 @@
 #include <qapplication.h>
 #include <qdesktopwidget.h>
 #include <qevent.h>
-#include <qlabel.h>
 #include <qpointer.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qstylepainter.h>
 #include <qtimer.h>
-#include <qtooltip.h>
 #include <private/qeffects_p.h>
 #include <qtextdocument.h>
 #include <qdebug.h>
 #include <private/qstylesheetstyle_p.h>
+
 #ifndef QT_NO_TOOLTIP
+#include <qlabel.h>
+#include <qtooltip.h>
 
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
 # include <private/qcore_mac_p.h>
-- 
cgit v1.2.3