From 61384e910d0dcf68495ac247388ab965e31dcae7 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 21 May 2017 12:50:24 +0200
Subject: Convert features.lcdnumber to QT_[REQUIRE_]CONFIG

Change-Id: Ie99d2ce0a836c27fb882c04ff465e6cdd483d360
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/accessible/simplewidgets.cpp | 4 +++-
 src/widgets/widgets/qlcdnumber.cpp       | 4 +---
 src/widgets/widgets/qlcdnumber.h         | 5 +----
 src/widgets/widgets/widgets.pri          | 9 +++++++--
 4 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index e557dc9615..b8ce9a9060 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -59,7 +59,9 @@
 #include <qlabel.h>
 #endif
 #include <qgroupbox.h>
+#if QT_CONFIG(lcdnumber)
 #include <qlcdnumber.h>
+#endif
 #include <qlineedit.h>
 #include <private/qlineedit_p.h>
 #include <qstyle.h>
@@ -464,7 +466,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const
                     str = qt_accStripAmp(str);
 #endif
 #endif // QT_CONFIG(label)
-#ifndef QT_NO_LCDNUMBER
+#if QT_CONFIG(lcdnumber)
             } else if (qobject_cast<QLCDNumber*>(object())) {
                 QLCDNumber *l = qobject_cast<QLCDNumber*>(object());
                 if (l->digitCount())
diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp
index aa052ef5cb..a0aeee2237 100644
--- a/src/widgets/widgets/qlcdnumber.cpp
+++ b/src/widgets/widgets/qlcdnumber.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qlcdnumber.h"
-#ifndef QT_NO_LCDNUMBER
+
 #include "qbitarray.h"
 #include "qpainter.h"
 #include "private/qframe_p.h"
@@ -1220,5 +1220,3 @@ bool QLCDNumber::event(QEvent *e)
 QT_END_NAMESPACE
 
 #include "moc_qlcdnumber.cpp"
-
-#endif // QT_NO_LCDNUMBER
diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h
index 33669fa900..28fd530e6e 100644
--- a/src/widgets/widgets/qlcdnumber.h
+++ b/src/widgets/widgets/qlcdnumber.h
@@ -45,8 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-
-#ifndef QT_NO_LCDNUMBER
+QT_REQUIRE_CONFIG(lcdnumber);
 
 class QLCDNumberPrivate;
 class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget
@@ -115,8 +114,6 @@ private:
     Q_DECLARE_PRIVATE(QLCDNumber)
 };
 
-#endif // QT_NO_LCDNUMBER
-
 QT_END_NAMESPACE
 
 #endif // QLCDNUMBER_H
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 086585f0e6..4d627e6f07 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -20,7 +20,6 @@ HEADERS += \
         widgets/qgroupbox.h \
         widgets/qkeysequenceedit.h \
         widgets/qkeysequenceedit_p.h \
-        widgets/qlcdnumber.h \
         widgets/qlineedit.h \
         widgets/qlineedit_p.h \
         widgets/qmainwindow.h \
@@ -84,7 +83,6 @@ SOURCES += \
         widgets/qframe.cpp \
         widgets/qgroupbox.cpp \
         widgets/qkeysequenceedit.cpp \
-        widgets/qlcdnumber.cpp \
         widgets/qlineedit_p.cpp \
         widgets/qlineedit.cpp \
         widgets/qmainwindow.cpp \
@@ -165,6 +163,13 @@ qtConfig(label) {
         widgets/qlabel.cpp
 }
 
+qtConfig(lcdnumber) {
+    HEADERS += \
+        widgets/qlcdnumber.h
+
+    SOURCES += \
+        widgets/qlcdnumber.cpp
+}
 
 qtConfig(pushbutton) {
     HEADERS += \
-- 
cgit v1.2.3