From 3aed1fccda2e3bcc0d8328543ef511b411b230d6 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Tue, 30 May 2017 21:25:32 +0200
Subject: [PATCH] Convert features.fontcombobox to QT_[REQUIRE_]CONFIG

Change-Id: I98f85cdb3b1c1ceae010362a5d5747d62ba62a22
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qfontcombobox.cpp | 4 ----
 src/widgets/widgets/qfontcombobox.h   | 4 +---
 src/widgets/widgets/widgets.pri       | 7 +++++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 9bd33409ae..f206d01999 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -39,8 +39,6 @@
 
 #include "qfontcombobox.h"
 
-#ifndef QT_NO_FONTCOMBOBOX
-
 #include <qstringlistmodel.h>
 #include <qitemdelegate.h>
 #include <qlistview.h>
@@ -563,5 +561,3 @@ QT_END_NAMESPACE
 
 #include "qfontcombobox.moc"
 #include "moc_qfontcombobox.cpp"
-
-#endif // QT_NO_FONTCOMBOBOX
diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h
index 983d5224dd..1e4555ce2d 100644
--- a/src/widgets/widgets/qfontcombobox.h
+++ b/src/widgets/widgets/qfontcombobox.h
@@ -44,11 +44,10 @@
 #include <QtWidgets/qcombobox.h>
 #include <QtGui/qfontdatabase.h>
 
-#ifndef QT_NO_FONTCOMBOBOX
+QT_REQUIRE_CONFIG(fontcombobox);
 
 QT_BEGIN_NAMESPACE
 
-
 class QFontComboBoxPrivate;
 
 class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox
@@ -101,5 +100,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFontComboBox::FontFilters)
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_FONTCOMBOBOX
 #endif
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 1779c8d183..726235ef4e 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -14,7 +14,6 @@ HEADERS += \
         widgets/qdockwidget.h \
         widgets/qdockwidget_p.h \
         widgets/qdockarealayout_p.h \
-        widgets/qfontcombobox.h \
         widgets/qframe.h \
         widgets/qframe_p.h \
         widgets/qgroupbox.h \
@@ -78,7 +77,6 @@ SOURCES += \
         widgets/qdockwidget.cpp \
         widgets/qdockarealayout.cpp \
         widgets/qeffects.cpp \
-        widgets/qfontcombobox.cpp \
         widgets/qframe.cpp \
         widgets/qgroupbox.cpp \
         widgets/qkeysequenceedit.cpp \
@@ -152,6 +150,11 @@ qtConfig(commandlinkbutton) {
         widgets/qcommandlinkbutton.cpp
 }
 
+qtConfig(fontcombobox) {
+    HEADERS += widgets/qfontcombobox.h
+    SOURCES += widgets/qfontcombobox.cpp
+}
+
 qtConfig(label) {
     HEADERS += \
         widgets/qlabel.h \