summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2021-07-13 23:46:52 +0200
committerMarc Mutz <marc.mutz@kdab.com>2021-07-28 09:43:03 +0200
commitbecb3596f092db6e8848696f08fca0740a58e932 (patch)
tree30ab88caa2cc9910bfbd32f71034fdc3b804fe12 /src/corelib
parentd3ecc6db293143bdd4a5da5f28144a7e145f257c (diff)
QtCore: clean up API removals
Use the same new pattern as in QtWidgets. Amends de18b3ff370543b5b99bd068b871a2cd677cf9f3. Change-Id: Ia1cbd40aa7a7efc9a954d22b599e13a19a6a9266 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/CMakeLists.txt4
-rw-r--r--src/corelib/compat/removed_api.cpp (renamed from src/corelib/tools/qtcore_tools_removed_functions_in_6_3.cpp)6
-rw-r--r--src/corelib/tools/qcryptographichash.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index d44011f6c3..db261d33cc 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -35,6 +35,7 @@ qt_internal_add_module(Core
NO_GENERATE_METATYPES # metatypes are extracted manually below
EXCEPTIONS
SOURCES
+ compat/removed_api.cpp
global/archdetect.cpp
global/qcompare_impl.h
global/qcompare.h
@@ -241,7 +242,6 @@ qt_internal_add_module(Core
tools/qsize.cpp tools/qsize.h
tools/qstack.h
tools/qtaggedpointer.h
- tools/qtcore_tools_removed_functions_in_6_3.cpp
tools/qtools_p.h
tools/qvarlengtharray.h
tools/qvector.h
@@ -273,8 +273,8 @@ qt_internal_add_module(Core
)
set(corelib_no_pch_sources
+ compat/removed_api.cpp
kernel/qmetatype.cpp
- tools/qtcore_tools_removed_functions_in_6_3.cpp
)
foreach(src ${corelib_no_pch_sources})
diff --git a/src/corelib/tools/qtcore_tools_removed_functions_in_6_3.cpp b/src/corelib/compat/removed_api.cpp
index 2f9b241f14..9bd7944c41 100644
--- a/src/corelib/tools/qtcore_tools_removed_functions_in_6_3.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -37,13 +37,13 @@
**
****************************************************************************/
-#define QT_BUILD_FUNCTIONS_REMOVED_IN_6_3
+#define QT_BUILD_REMOVED_API
#include "qglobal.h"
QT_USE_NAMESPACE
-#if QT_DEPRECATED_SINCE(6, 3)
+#if QT_REMOVED_SINCE(6, 3)
#include "tools/qcryptographichash.h"
@@ -60,4 +60,4 @@ QByteArray QCryptographicHash::hash(const QByteArray &data, Algorithm method)
// #include <qotherheader.h>
// // implement removed functions from qotherheader.h
-#endif // QT_DEPRECATED_SINCE(6, 3)
+#endif // QT_REMOVED_SINCE(6, 3)
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h
index b3ab9c6126..83aed7c64c 100644
--- a/src/corelib/tools/qcryptographichash.h
+++ b/src/corelib/tools/qcryptographichash.h
@@ -108,7 +108,7 @@ public:
QT_DEPRECATED_VERSION_X_6_4("Use the QByteArrayView overload instead")
void addData(const char *data, qsizetype length);
#endif
-#ifdef QT_BUILD_FUNCTIONS_REMOVED_IN_6_3
+#if QT_REMOVED_SINCE(6, 3)
void addData(const QByteArray &data);
#endif
void addData(QByteArrayView data) noexcept;
@@ -117,7 +117,7 @@ public:
QByteArray result() const;
QByteArrayView resultView() const noexcept;
-#ifdef QT_BUILD_FUNCTIONS_REMOVED_IN_6_3
+#if QT_REMOVED_SINCE(6, 3)
static QByteArray hash(const QByteArray &data, Algorithm method);
#endif
static QByteArray hash(QByteArrayView data, Algorithm method);