summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2024-12-29 12:35:25 -0300
committerThiago Macieira <thiago.macieira@intel.com>2024-12-30 19:45:58 -0300
commitc7f64d84fbd9b5b3cac41c1d81dc4d0479fc3fa1 (patch)
tree9e751805c09feca0375941ec52ddedbf5d8258ff /src
parent002f12bf05a8ed977e2fec582d03039ab0bb11ca (diff)
Bootstrap: remove QUuid and QCryptographicHash: they're now unused
The previous commit removed the one use of QUuid and, through it, QCryptographicHash in one of the three bootstrapped tools. Change-Id: I31b7f9f6aa402709bad7fffd3a65e86be7f6d882 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qconfig-bootstrapped.h1
-rw-r--r--src/corelib/kernel/qmetatype.cpp4
-rw-r--r--src/corelib/kernel/qmetatype_p.h3
-rw-r--r--src/corelib/plugin/quuid.cpp8
-rw-r--r--src/corelib/tools/qcryptographichash.cpp4
-rw-r--r--src/tools/bootstrap/CMakeLists.txt2
6 files changed, 7 insertions, 15 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
index 39793fdaf51..c72b06f457e 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
@@ -35,7 +35,6 @@
// Keep feature-test macros in alphabetic order by feature name:
#define QT_FEATURE_cborstreamreader -1
#define QT_FEATURE_cborstreamwriter 1
-#define QT_CRYPTOGRAPHICHASH_ONLY_SHA1
#define QT_FEATURE_cxx17_filesystem -1
#define QT_NO_DATASTREAM
#define QT_FEATURE_datestring 1
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index a172fc8348a..eecb32736fb 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -19,7 +19,6 @@
#if QT_CONFIG(easingcurve)
#include "qeasingcurve.h"
#endif
-#include "quuid.h"
#if QT_CONFIG(regularexpression)
# include "qregularexpression.h"
@@ -30,6 +29,7 @@
# include "qbitarray.h"
# include "qurl.h"
+# include "quuid.h"
# include "qvariant.h"
# include "qjsonvalue.h"
# include "qjsonobject.h"
@@ -1255,10 +1255,12 @@ static constexpr struct : QMetaTypeModuleHelper
);
QMETATYPE_CONVERTER(QByteArray, Nullptr, Q_UNUSED(source); result = QByteArray(); return true;);
+#ifndef QT_BOOTSTRAPPED
QMETATYPE_CONVERTER(QString, QUuid, result = source.toString(); return true;);
QMETATYPE_CONVERTER(QUuid, QString, result = QUuid(source); return true;);
QMETATYPE_CONVERTER(QByteArray, QUuid, result = source.toByteArray(); return true;);
QMETATYPE_CONVERTER(QUuid, QByteArray, result = QUuid(source); return true;);
+#endif
#ifndef QT_NO_GEOM_VARIANT
QMETATYPE_CONVERTER(QSize, QSizeF, result = source.toSize(); return true;);
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index 7e0457771f0..7922a3993a7 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -68,6 +68,7 @@ struct TypeDefinition
// Ignore these types, as incomplete
#ifdef QT_BOOTSTRAPPED
template<> struct TypeDefinition<QBitArray> { static const bool IsAvailable = false; };
+template<> struct TypeDefinition<QByteArrayList> { static const bool IsAvailable = false; };
template<> struct TypeDefinition<QCborArray> { static const bool IsAvailable = false; };
template<> struct TypeDefinition<QCborMap> { static const bool IsAvailable = false; };
template<> struct TypeDefinition<QCborSimpleType> { static const bool IsAvailable = false; };
@@ -80,7 +81,7 @@ template<> struct TypeDefinition<QJsonDocument> { static const bool IsAvailable
template<> struct TypeDefinition<QJsonObject> { static const bool IsAvailable = false; };
template<> struct TypeDefinition<QJsonValue> { static const bool IsAvailable = false; };
template<> struct TypeDefinition<QUrl> { static const bool IsAvailable = false; };
-template<> struct TypeDefinition<QByteArrayList> { static const bool IsAvailable = false; };
+template<> struct TypeDefinition<QUuid> { static const bool IsAvailable = false; };
#endif
#ifdef QT_NO_GEOM_VARIANT
template<> struct TypeDefinition<QRect> { static const bool IsAvailable = false; };
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index e0d621dec80..a185dbafb1b 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -579,12 +579,10 @@ QUuid QUuid::fromString(QAnyStringView text) noexcept
\sa variant(), version(), createUuidV3()
*/
-#ifndef QT_BOOTSTRAPPED
QUuid QUuid::createUuidV3(QUuid ns, QByteArrayView baseData) noexcept
{
return createFromName(ns, baseData, QCryptographicHash::Md5, 3);
}
-#endif
QUuid QUuid::createUuidV5(QUuid ns, QByteArrayView baseData) noexcept
{
@@ -603,12 +601,10 @@ QUuid QUuid::createUuidV5(QUuid ns, QByteArrayView baseData) noexcept
\sa variant(), version(), createUuidV3(), createUuidV5()
*/
-#ifndef QT_BOOTSTRAPPED
QUuid QUuid::createUuidV7()
{
return createUuidV7_internal(std::chrono::system_clock::now());
}
-#endif // !defined(QT_BOOTSTRAPPED)
/*!
Creates a QUuid object from the binary representation of the UUID, as
@@ -948,7 +944,7 @@ QUuid QUuid::createUuid()
return result;
}
-#elif !defined(QT_BOOTSTRAPPED)
+#else
QUuid QUuid::createUuid()
{
@@ -962,7 +958,7 @@ QUuid QUuid::createUuid()
return result;
}
-#endif // !Q_OS_WIN && !QT_BOOTSTRAPPED
+#endif // !Q_OS_WIN
/*!
\fn bool QUuid::operator==(const QUuid &lhs, const GUID &rhs)
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index a38e9c2d3b1..0e677ceea36 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -17,10 +17,6 @@
#include "../../3rdparty/sha1/sha1.cpp"
-#if defined(QT_BOOTSTRAPPED) && !defined(QT_CRYPTOGRAPHICHASH_ONLY_SHA1)
-# error "Are you sure you need the other hashing algorithms besides SHA-1?"
-#endif
-
// Header from rfc6234
#include "../../3rdparty/rfc6234/sha.h"
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 06a5a79f3e7..fdcf2a04fbd 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -38,7 +38,6 @@ qt_internal_extend_target(Bootstrap
../../corelib/kernel/qcoreapplication.cpp
../../corelib/kernel/qmetatype.cpp
../../corelib/kernel/qsystemerror.cpp
- ../../corelib/plugin/quuid.cpp
../../corelib/serialization/qcborcommon.cpp
../../corelib/serialization/qcborstreamwriter.cpp
../../corelib/serialization/qcborvalue.cpp
@@ -70,7 +69,6 @@ qt_internal_extend_target(Bootstrap
../../corelib/tools/qarraydata.cpp
../../corelib/tools/qcommandlineoption.cpp
../../corelib/tools/qcommandlineparser.cpp
- ../../corelib/tools/qcryptographichash.cpp
../../corelib/tools/qhash.cpp
../../corelib/tools/qringbuffer.cpp
DEFINES
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-11 16:47:13 +0000