QtCore/removed_api: fix 6.8 block order, global include

There must be no include other than qglobal.h¹ outside
QT_CORE_REMOVED_SINCE blocks, otherwise REMOVED_SINCE in that header
might not work correctly.

Move the include to the block in which it's used.

¹ and we should eventually reduce that to the bare minimum, too.  This
  include is still from the time when there was only the monolithic
  qglobal.h.

Amends bfc7535a10.

Also move the qstring.h block which was not in alphabetical order.

Amends 42b6fdfb52.

Change-Id: I997ebf0028e31ef86145d2d0c7455e7c54bbf7e9
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>

src/corelib/compat/removed_api.cpp

@@ -4,7 +4,6 @@
 #define QT_CORE_BUILD_REMOVED_API
 
 #include "qglobal.h"
-#include "qnumeric.h"
 
 QT_USE_NAMESPACE
 
@@ -1014,6 +1013,7 @@ bool QMimeType::operator==(const QMimeType &other) const
 }
 
 #include "qobject.h"
+#include "qnumeric.h"
 
 int QObject::startTimer(std::chrono::milliseconds time, Qt::TimerType timerType)
 {
@@ -1071,6 +1071,8 @@ qsizetype QRegularExpressionMatch::capturedEnd(QStringView name) const
 }
 #endif // QT_CONFIG(regularexpression)
 
+#include "qstring.h" // inlined API
+
 #include "qurl.h"
 
 bool QUrl::operator<(const QUrl &url) const
@@ -1095,8 +1097,6 @@ bool QUrlQuery::operator==(const QUrlQuery &other) const
     return comparesEqual(*this, other);
 }
 
-#include "qstring.h" // inlined API
-
 #include "qxmlstream.h" // inlined API
 
 // #include "qotherheader.h"