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

Fix position of qtimer.h in removed_api.cpp

Browse Source 
The include for INLINE_SINCE(6, 8) QTimer API was in the 6.7
block. Move it to the 6.8 block.

Amends a4a679ee796a476048ddee3f88025035cca3631a.

Change-Id: I503428bcb73138af5eaed8f1d1523a448e1bf67c
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 0dd5b2de4c59e2f0175aba3cf720a47998108330)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-08-28 14:54:11 +02:00 committed by Qt Cherry-pick Bot
parent 52f471e23e
commit 5d23f03860
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/compat/removed_api.cpp
View File

@ -926,8 +926,6 @@ QUrl QUrl::fromEncoded(const QByteArray &input, ParsingMode mode)
return QUrl::fromEncoded(QByteArrayView(input), mode);
}
#include "qtimer.h" // inlined API
// #include "qotherheader.h"
// // implement removed functions from qotherheader.h
@ -1168,6 +1166,8 @@ auto QStringConverter::encodingForName(const char *name) noexcept -> std::option
# include "qthreadpool.h" // inlined API
#endif
#include "qtimer.h" // inlined API
#include "qurl.h"
bool QUrl::operator<(const QUrl &url) const