AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtCore: clean up API removals

Browse Source 
Use the same new pattern as in QtWidgets.

Amends de18b3ff37.

Change-Id: Ia1cbd40aa7a7efc9a954d22b599e13a19a6a9266
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2021-07-13 23:46:52 +02:00
parent d3ecc6db29
commit becb3596f0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/CMakeLists.txt
View File

@ -35,6 +35,7 @@ qt_internal_add_module(Core
NO_GENERATE_METATYPES # metatypes are extracted manually below NO_GENERATE_METATYPES # metatypes are extracted manually below
EXCEPTIONS EXCEPTIONS
SOURCES SOURCES
compat/removed_api.cpp
global/archdetect.cpp global/archdetect.cpp
global/qcompare_impl.h global/qcompare_impl.h
global/qcompare.h global/qcompare.h
@ -241,7 +242,6 @@ qt_internal_add_module(Core
tools/qsize.cpp tools/qsize.h tools/qsize.cpp tools/qsize.h
tools/qstack.h tools/qstack.h
tools/qtaggedpointer.h tools/qtaggedpointer.h
tools/qtcore_tools_removed_functions_in_6_3.cpp
tools/qtools_p.h tools/qtools_p.h
tools/qvarlengtharray.h tools/qvarlengtharray.h
tools/qvector.h tools/qvector.h
@ -273,8 +273,8 @@ qt_internal_add_module(Core
) )
set(corelib_no_pch_sources set(corelib_no_pch_sources
compat/removed_api.cpp
kernel/qmetatype.cpp kernel/qmetatype.cpp
tools/qtcore_tools_removed_functions_in_6_3.cpp
) )
foreach(src ${corelib_no_pch_sources}) foreach(src ${corelib_no_pch_sources})

6
src/corelib/tools/qtcore_tools_removed_functions_in_6_3.cpp → src/corelib/compat/removed_api.cpp
View File

@ -37,13 +37,13 @@
** **
****************************************************************************/ ****************************************************************************/
#define QT_BUILD_FUNCTIONS_REMOVED_IN_6_3 #define QT_BUILD_REMOVED_API
#include "qglobal.h" #include "qglobal.h"
QT_USE_NAMESPACE QT_USE_NAMESPACE
#if QT_DEPRECATED_SINCE(6, 3) #if QT_REMOVED_SINCE(6, 3)
#include "tools/qcryptographichash.h" #include "tools/qcryptographichash.h"
@ -60,4 +60,4 @@ QByteArray QCryptographicHash::hash(const QByteArray &data, Algorithm method)
// #include <qotherheader.h> // #include <qotherheader.h>
// // implement removed functions from qotherheader.h // // implement removed functions from qotherheader.h
#endif // QT_DEPRECATED_SINCE(6, 3) #endif // QT_REMOVED_SINCE(6, 3)

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

@ -108,7 +108,7 @@ public:
QT_DEPRECATED_VERSION_X_6_4("Use the QByteArrayView overload instead") QT_DEPRECATED_VERSION_X_6_4("Use the QByteArrayView overload instead")
void addData(const char *data, qsizetype length); void addData(const char *data, qsizetype length);
#endif #endif
#ifdef QT_BUILD_FUNCTIONS_REMOVED_IN_6_3 #if QT_REMOVED_SINCE(6, 3)
void addData(const QByteArray &data); void addData(const QByteArray &data);
#endif #endif
void addData(QByteArrayView data) noexcept; void addData(QByteArrayView data) noexcept;
@ -117,7 +117,7 @@ public:
QByteArray result() const; QByteArray result() const;
QByteArrayView resultView() const noexcept; 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); static QByteArray hash(const QByteArray &data, Algorithm method);
#endif #endif
static QByteArray hash(QByteArrayView data, Algorithm method); static QByteArray hash(QByteArrayView data, Algorithm method);