From 24df951f3656eee1554307c30c33cbcc5defb0ed Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Thu, 2 Mar 2017 14:28:14 +0100
Subject: Build fix for -no-feature-validator

Change-Id: Ib5c89c0934d5dbf2fe31c9ced09998c8a7405801
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/controls/Private/qquickspinboxvalidator.cpp | 4 ++++
 src/controls/Private/qquickspinboxvalidator_p.h | 3 +++
 src/controls/plugin.cpp                         | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/controls/Private/qquickspinboxvalidator.cpp b/src/controls/Private/qquickspinboxvalidator.cpp
index 6723defe..0806523a 100644
--- a/src/controls/Private/qquickspinboxvalidator.cpp
+++ b/src/controls/Private/qquickspinboxvalidator.cpp
@@ -39,6 +39,8 @@
 
 #include "qquickspinboxvalidator_p.h"
 
+#if QT_CONFIG(validator)
+
 QT_BEGIN_NAMESPACE
 
 QQuickSpinBoxValidator1::QQuickSpinBoxValidator1(QObject *parent)
@@ -242,3 +244,5 @@ QString QQuickSpinBoxValidator1::textFromValue(qreal value) const
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_CONFIG(validator)
diff --git a/src/controls/Private/qquickspinboxvalidator_p.h b/src/controls/Private/qquickspinboxvalidator_p.h
index 7ca6901e..baaeb1b3 100644
--- a/src/controls/Private/qquickspinboxvalidator_p.h
+++ b/src/controls/Private/qquickspinboxvalidator_p.h
@@ -43,6 +43,8 @@
 #include <QtGui/qvalidator.h>
 #include <QtQml/qqml.h>
 
+#if QT_CONFIG(validator)
+
 QT_BEGIN_NAMESPACE
 
 class QQuickSpinBoxValidator1 : public QValidator, public QQmlParserStatus
@@ -123,4 +125,5 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickSpinBoxValidator1)
 
+#endif // QT_CONFIG(validator)
 #endif // QQUICKSPINBOXVALIDATOR_P_H
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 528f05a8..8a79cbe3 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -162,7 +162,9 @@ void QtQuickControls1Plugin::initializeEngine(QQmlEngine *engine, const char *ur
     qmlRegisterType<QQuickRangedDate1>(private_uri, 1, 0, "RangedDate");
     qmlRegisterType<QQuickRangeModel1>(private_uri, 1, 0, "RangeModel");
     qmlRegisterType<QQuickWheelArea1>(private_uri, 1, 0, "WheelArea");
+#if QT_CONFIG(validator)
     qmlRegisterType<QQuickSpinBoxValidator1>(private_uri, 1, 0, "SpinBoxValidator");
+#endif
     qmlRegisterSingletonType<QQuickTooltip1>(private_uri, 1, 0, "Tooltip", QQuickControlsPrivate1::registerTooltipModule);
     qmlRegisterSingletonType<QQuickControlSettings1>(private_uri, 1, 0, "Settings", QQuickControlsPrivate1::registerSettingsModule);
 
-- 
cgit v1.2.1