diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2024-02-27 19:20:10 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2024-03-13 00:00:48 -0800 |
| commit | cdbc76360ae4c12b25923a7cb392355a6485fc70 (patch) | |
| tree | 850791132750960ccdb31cad3825e0559439dfa7 /src/corelib/serialization/qjsonvalue.cpp | |
| parent | 4be7c046b1792a97e6e3e5c9dd9e3f71ffb11529 (diff) | |
Bootstrap: remove QVariant
I added QT_NO_VARIANT to qconfig-bootstrapped.h to be clearer on what
the #ifs are, but there's no testing of that feature outside of
QT_BOOTSTRAPPED.
Change-Id: I01ec3c774d9943adb903fffd17b7e8ac4340fb89
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjsonvalue.cpp')
| -rw-r--r-- | src/corelib/serialization/qjsonvalue.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 29da9058f20..2d114b90721 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -345,6 +345,7 @@ void QJsonValue::swap(QJsonValue &other) noexcept error cases as e.g. accessing a non existing key in a QJsonObject. */ +#ifndef QT_NO_VARIANT /*! Converts \a variant to a QJsonValue and returns it. @@ -587,6 +588,7 @@ QVariant QJsonValue::toVariant() const error condition, when trying to read an out of bounds value in an array or a non existent key in an object. */ +#endif // !QT_NO_VARIANT /*! Returns the type of the value. @@ -936,10 +938,12 @@ QJsonValueRef &QJsonValueRef::operator =(const QJsonValueRef &ref) return assignToRef(*this, d->valueAt(index), is_object); } +#ifndef QT_NO_VARIANT QVariant QJsonValueConstRef::toVariant() const { return concrete(*this).toVariant(); } +#endif // !QT_NO_VARIANT QJsonArray QJsonValueConstRef::toArray() const { |