1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bootstrap: remove QBitArray

Browse Source 
It appears to be used only in qlalr, which is, however, not
bootstrapped.

Pick-to: 6.6 6.5 6.2
Change-Id: Idc16d957bf687238c7b0ee603d8b092e2048ef18
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit e57f7b1b01b9b34a51a4ee3f898ef7f1fb013f17)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-01-29 21:30:30 +01:00 committed by Qt Cherry-pick Bot
parent 9483d87ef3
commit 1c1ce73699
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qvariant.cpp
View File

@ -942,7 +942,9 @@ QVariant::QVariant(double val) noexcept : d(std::piecewise_construct_t{}, val) {
QVariant::QVariant(float val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(float val) noexcept : d(std::piecewise_construct_t{}, val) {}
QVariant::QVariant(const QByteArray &val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(const QByteArray &val) noexcept : d(std::piecewise_construct_t{}, val) {}
#ifndef QT_BOOTSTRAPPED
QVariant::QVariant(const QBitArray &val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(const QBitArray &val) noexcept : d(std::piecewise_construct_t{}, val) {}
#endif
QVariant::QVariant(const QString &val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(const QString &val) noexcept : d(std::piecewise_construct_t{}, val) {}
QVariant::QVariant(QChar val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(QChar val) noexcept : d(std::piecewise_construct_t{}, val) {}
QVariant::QVariant(const QStringList &val) noexcept : d(std::piecewise_construct_t{}, val) {} QVariant::QVariant(const QStringList &val) noexcept : d(std::piecewise_construct_t{}, val) {}
@ -1843,6 +1845,7 @@ QChar QVariant::toChar() const
return qvariant_cast<QChar>(*this); return qvariant_cast<QChar>(*this);
} }
#ifndef QT_BOOTSTRAPPED
/*! /*!
Returns the variant as a QBitArray if the variant has userType() Returns the variant as a QBitArray if the variant has userType()
\l QMetaType::QBitArray; otherwise returns an empty bit array. \l QMetaType::QBitArray; otherwise returns an empty bit array.
@ -1853,6 +1856,7 @@ QBitArray QVariant::toBitArray() const
{ {
return qvariant_cast<QBitArray>(*this); return qvariant_cast<QBitArray>(*this);
} }
#endif // QT_BOOTSTRAPPED
template <typename T> template <typename T>
inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok) inline T qNumVariantToHelper(const QVariant::Private &d, bool *ok)

4
src/corelib/kernel/qvariant.h
View File

@ -263,7 +263,9 @@ public:
QVariant(QChar qchar) noexcept; QVariant(QChar qchar) noexcept;
QVariant(QDate date) noexcept; QVariant(QDate date) noexcept;
QVariant(QTime time) noexcept; QVariant(QTime time) noexcept;
#ifndef QT_BOOTSTRAPPED
QVariant(const QBitArray &bitarray) noexcept; QVariant(const QBitArray &bitarray) noexcept;
#endif
QVariant(const QByteArray &bytearray) noexcept; QVariant(const QByteArray &bytearray) noexcept;
QVariant(const QDateTime &datetime) noexcept; QVariant(const QDateTime &datetime) noexcept;
QVariant(const QHash<QString, QVariant> &hash) noexcept; QVariant(const QHash<QString, QVariant> &hash) noexcept;
@ -372,7 +374,9 @@ public:
float toFloat(bool *ok = nullptr) const; float toFloat(bool *ok = nullptr) const;
qreal toReal(bool *ok = nullptr) const; qreal toReal(bool *ok = nullptr) const;
QByteArray toByteArray() const; QByteArray toByteArray() const;
#ifndef QT_BOOTSTRAPPED
QBitArray toBitArray() const; QBitArray toBitArray() const;
#endif
QString toString() const; QString toString() const;
QStringList toStringList() const; QStringList toStringList() const;
QChar toChar() const; QChar toChar() const;

2
src/corelib/tools/qhash.cpp
View File

@ -963,6 +963,7 @@ size_t qHash(QStringView key, size_t seed) noexcept
return qHashBits(key.data(), key.size()*sizeof(QChar), seed); return qHashBits(key.data(), key.size()*sizeof(QChar), seed);
} }
#ifndef QT_BOOTSTRAPPED
size_t qHash(const QBitArray &bitArray, size_t seed) noexcept size_t qHash(const QBitArray &bitArray, size_t seed) noexcept
{ {
qsizetype m = bitArray.d.size() - 1; qsizetype m = bitArray.d.size() - 1;
@ -975,6 +976,7 @@ size_t qHash(const QBitArray &bitArray, size_t seed) noexcept
result = ((result << 4) + bitArray.d.at(m)) & ((1 << n) - 1); result = ((result << 4) + bitArray.d.at(m)) & ((1 << n) - 1);
return result; return result;
} }
#endif
size_t qHash(QLatin1StringView key, size_t seed) noexcept size_t qHash(QLatin1StringView key, size_t seed) noexcept
{ {

4
src/corelib/tools/qhashfunctions.h
View File

@ -153,7 +153,9 @@ inline Q_DECL_PURE_FUNCTION size_t qHash(const QByteArray &key, size_t seed = 0
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QStringView key, size_t seed = 0) noexcept; Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QStringView key, size_t seed = 0) noexcept;
inline Q_DECL_PURE_FUNCTION size_t qHash(const QString &key, size_t seed = 0) noexcept inline Q_DECL_PURE_FUNCTION size_t qHash(const QString &key, size_t seed = 0) noexcept
{ return qHash(QStringView{key}, seed); } { return qHash(QStringView{key}, seed); }
#ifndef QT_BOOTSTRAPPED
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QBitArray &key, size_t seed = 0) noexcept; Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QBitArray &key, size_t seed = 0) noexcept;
#endif
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QLatin1StringView key, size_t seed = 0) noexcept; Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QLatin1StringView key, size_t seed = 0) noexcept;
Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(QKeyCombination key, size_t seed = 0) noexcept Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(QKeyCombination key, size_t seed = 0) noexcept
{ return qHash(key.toCombined(), seed); } { return qHash(key.toCombined(), seed); }
@ -326,7 +328,9 @@ QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QStringView)
QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QLatin1StringView) QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QLatin1StringView)
QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QByteArrayView) QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QByteArrayView)
QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QByteArray) QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QByteArray)
#ifndef QT_BOOTSTRAPPED
QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray) QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
#endif
QT_END_NAMESPACE QT_END_NAMESPACE

1
src/tools/bootstrap/CMakeLists.txt
View File

@ -80,7 +80,6 @@ qt_internal_extend_target(Bootstrap
../../corelib/time/qromancalendar.cpp ../../corelib/time/qromancalendar.cpp
../../corelib/time/qtimezone.cpp ../../corelib/time/qtimezone.cpp
../../corelib/tools/qarraydata.cpp ../../corelib/tools/qarraydata.cpp
../../corelib/tools/qbitarray.cpp
../../corelib/tools/qcommandlineoption.cpp ../../corelib/tools/qcommandlineoption.cpp
../../corelib/tools/qcommandlineparser.cpp ../../corelib/tools/qcommandlineparser.cpp
../../corelib/tools/qcryptographichash.cpp ../../corelib/tools/qcryptographichash.cpp