From 163863f77d891f56573e4dae316d16cfc2fefc8f Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sat, 22 Jul 2017 15:16:51 +0200
Subject: Convert features.combobox to QT_[REQUIRE_]CONFIG

Change-Id: I2f415de8556289a6461a645d559be17089c43c99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qcombobox.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/widgets/widgets/qcombobox.h')

diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 8f99594a76..a6aac6f8aa 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -46,9 +46,9 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qvariant.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(combobox);
 
-#ifndef QT_NO_COMBOBOX
+QT_BEGIN_NAMESPACE
 
 class QAbstractItemView;
 class QLineEdit;
@@ -277,8 +277,6 @@ inline void QComboBox::insertItem(int aindex, const QString &atext,
                                   const QVariant &auserData)
 { insertItem(aindex, QIcon(), atext, auserData); }
 
-#endif // QT_NO_COMBOBOX
-
 QT_END_NAMESPACE
 
 #endif // QCOMBOBOX_H
-- 
cgit v1.2.3