From 5d23f038606ee4c135688a8994969ebeafebe4c0 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 28 Aug 2024 14:54:11 +0200
Subject: [PATCH] Fix position of qtimer.h in removed_api.cpp

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>
---
 src/corelib/compat/removed_api.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 44e62508138..e9e4e7edeeb 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -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