From e579076bb36e6594003b2ade7f3d062944ef6f47 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 16 Nov 2016 14:22:36 +0100
Subject: Get rid of most QT_NO_FOO usages

Instead use QT_CONFIG(foo). This change actually detected a few
mis-spelled macros and invalid usages.

Change-Id: I06ac327098dd1a458e6bc379d637b8e2dac52f85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/quick/util/qquickanimatorjob_p.h | 2 +-
 src/quick/util/qquickglobal.cpp      | 2 +-
 src/quick/util/qquickutilmodule.cpp  | 4 ++--
 src/quick/util/qquickvalidator.cpp   | 4 ++--
 src/quick/util/qquickvalidator_p.h   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/quick/util')

diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 64e849d322..e891ebab72 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -277,7 +277,7 @@ public:
 private:
     QSGOpacityNode *m_opacityNode;
 };
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(opengl)
 class Q_QUICK_PRIVATE_EXPORT QQuickUniformAnimatorJob : public QQuickAnimatorJob
 {
 public:
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 7692cc79f9..5a723e4432 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -783,7 +783,7 @@ public:
         return new QQuickApplication(parent);
     }
 
-#ifndef QT_NO_IM
+#if QT_CONFIG(im)
     QInputMethod *inputMethod()
     {
         QInputMethod *im = qGuiApp->inputMethod();
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp
index 7e2973a78b..c1bc3d60b8 100644
--- a/src/quick/util/qquickutilmodule.cpp
+++ b/src/quick/util/qquickutilmodule.cpp
@@ -67,7 +67,7 @@ Q_DECLARE_METATYPE(QKeySequence::StandardKey)
 
 void QQuickUtilModule::defineModule()
 {
-#ifndef QT_NO_IM
+#if QT_CONFIG(im)
     qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod",
                                              QInputMethod::tr("InputMethod is an abstract class"));
 #endif
@@ -94,7 +94,7 @@ void QQuickUtilModule::defineModule()
     qmlRegisterType<QQuickTransition>("QtQuick",2,0,"Transition");
     qmlRegisterType<QQuickVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation");
 
-#ifndef QT_NO_VALIDATOR
+#if QT_CONFIG(validator)
     qmlRegisterType<QValidator>();
     qmlRegisterType<QQuickIntValidator>("QtQuick",2,0,"IntValidator");
     qmlRegisterType<QQuickDoubleValidator>("QtQuick",2,0,"DoubleValidator");
diff --git a/src/quick/util/qquickvalidator.cpp b/src/quick/util/qquickvalidator.cpp
index 67cb6a6c05..015a376603 100644
--- a/src/quick/util/qquickvalidator.cpp
+++ b/src/quick/util/qquickvalidator.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_VALIDATOR
+#if QT_CONFIG(validator)
 
 /*!
     \qmltype IntValidator
@@ -221,7 +221,7 @@ void QQuickDoubleValidator::resetLocaleName()
    By default, this property contains a regular expression with the pattern .* that matches any string.
 */
 
-#endif // QT_NO_VALIDATOR
+#endif // validator
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h
index 97adfb742a..ba188e947a 100644
--- a/src/quick/util/qquickvalidator_p.h
+++ b/src/quick/util/qquickvalidator_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_VALIDATOR
+#if QT_CONFIG(validator)
 class Q_AUTOTEST_EXPORT QQuickIntValidator : public QIntValidator
 {
     Q_OBJECT
@@ -90,7 +90,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-#ifndef QT_NO_VALIDATOR
+#if QT_CONFIG(validator)
 QML_DECLARE_TYPE(QValidator)
 QML_DECLARE_TYPE(QQuickIntValidator)
 QML_DECLARE_TYPE(QQuickDoubleValidator)
-- 
cgit v1.2.3