aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktextinput.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>2023-01-16 14:21:43 +0900
committerTasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>2023-01-17 15:22:17 +0900
commit67b3dc89013b6d3d0a190410004d1c4f9bd7fcf0 (patch)
tree33bedaf4c87a4cc064cfae37e6dcb6b890b91a4d /src/quick/items/qquicktextinput.cpp
parent8c99531cdc63fccff229f3603ae8b24807273593 (diff)
Fix build with -no-feature-validator
By removing property, getter, setter and notify signal for validator. .../qmetatype.h: In instantiation of ‘constexpr bool QtPrivate::checkTypeIsSuitableForMetaType() [with X = QValidator*]’: .../qmetatype.h:2589:9: required from ‘constexpr const QtPrivate::QMetaTypeInterface* QtPrivate::qTryMetaTypeInterfaceForType() [with Unique = void; TypeCompletePair = QtPrivate::TypeAndForceComplete<QValidator*, std::integral_constant<bool, true> >]’ .../qmetatype.h:2639:102: required from ‘constexpr const QtPrivate::QMetaTypeInterface* const qt_metaTypeArray [72]<int, QVariant, QQmlInstanceModel*, bool, int, int, QString, QString, QString, QQmlComponent*, QQuickItem*, QQuickPopup*, bool, bool, bool, QString, QValidator*, QFlags<Qt::InputMethodHint>, bool, bool, double, double, QVariant, QString, bool, QQuickComboBox::ImplicitContentWidthPolicy, QQuickComboBox, void, int, void, int, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, void, QString, int, int, const QString&, QFlags<Qt::MatchFlag>, int, const QString&, QVariant, int, int, const QVariant&>’ .../moc_qquickcombobox_p.cpp:588:5: required from here .../qmetatype.h:1181:55: error: static assertion failed: Pointer Meta Types must either point to fully-defined types or be declared with Q_DECLARE_OPAQUE_POINTER(T *) Pick-to: 6.5 Change-Id: I0ee5ae9c84bc977571f39788299f1d84a7e582c5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
-rw-r--r--src/quick/items/qquicktextinput.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index f798fcd6a8..1df764f79b 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -996,6 +996,7 @@ void QQuickTextInput::setAutoScroll(bool b)
emit autoScrollChanged(d->autoScroll);
}
+#if QT_CONFIG(validator)
/*!
\qmlproperty Validator QtQuick::TextInput::validator
@@ -1022,19 +1023,12 @@ void QQuickTextInput::setAutoScroll(bool b)
QValidator* QQuickTextInput::validator() const
{
-#if !QT_CONFIG(validator)
- return nullptr;
-#else
Q_D(const QQuickTextInput);
return d->m_validator;
-#endif // validator
}
void QQuickTextInput::setValidator(QValidator* v)
{
-#if !QT_CONFIG(validator)
- Q_UNUSED(v);
-#else
Q_D(QQuickTextInput);
if (d->m_validator == v)
return;
@@ -1057,10 +1051,8 @@ void QQuickTextInput::setValidator(QValidator* v)
d->checkIsValid();
emit validatorChanged();
-#endif // validator
}
-#if QT_CONFIG(validator)
void QQuickTextInput::q_validatorChanged()
{
Q_D(QQuickTextInput);