From d5c605b14896a444430414a7dc719397107cdc9d Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Mon, 6 Dec 2021 13:30:10 +0100
Subject: QMetaType: port the BC fix for id() to new QT_REMOVED_SINCE

The allows qmetatype.cpp compilation to enjoy PCH again.

Change-Id: I47c5af33a5dbc930ee4c120b254e732c52bc2369
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/corelib/kernel/qmetatype.cpp | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/corelib/kernel/qmetatype.cpp')

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index cb45031c9a..9494ff84f9 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -37,9 +37,7 @@
 **
 ****************************************************************************/
 
-#define QT_QMETATYPE_BC_COMPAT 1
 #include "qmetatype.h"
-#undef QT_QMETATYPE_BC_COMPAT
 #include "qmetatype_p.h"
 #include "qobjectdefs.h"
 #include "qdatetime.h"
@@ -491,18 +489,6 @@ bool QMetaType::isRegistered() const
     Returns id type hold by this QMetatype instance.
 */
 
-// keep in sync with version in header
-// ### Qt 7::remove BC helper
-int QMetaType::id() const
-{
-    if (d_ptr) {
-        if (int id = d_ptr->typeId.loadRelaxed())
-            return id;
-        return idHelper();
-    }
-    return 0;
-}
-
 /*!
     \internal
     The slowpath of id(). Precondition: d_ptr != nullptr
-- 
cgit v1.2.3