diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-01-23 11:56:16 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2023-02-07 18:36:11 +0100 |
| commit | 115a38613c0ed0ea1d6c82d927809074cb69f385 (patch) | |
| tree | 21eddddd1682219284c4d5ea6a06eb18f3d982c1 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 834e97ce46c9e322ad6d5b7fc9bf5709ce11a401 (diff) | |
QMetaObject: Fix version check for deprecated methods
We don't want them in Qt 7.0.0, either.
As a drive-by, also guard the implementation with the same check.
Pick-to: 6.5
Change-Id: I21b181e5563ebc2b247d6c5ad005bb76224f0daf
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 73c62da896..387ef93d8f 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -204,6 +204,7 @@ private: enum { MaximumParamCount = 11 }; // up to 10 arguments + 1 return value +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) /*! \since 4.5 \obsolete [6.5] Please use the variadic overload of this function @@ -249,6 +250,7 @@ QObject *QMetaObject::newInstance(QGenericArgument val0, return newInstanceImpl(this, paramCount, parameters, typeNames, nullptr); } +#endif /*! \fn template <typename... Args> QObject *QMetaObject::newInstance(Args &&... arguments) const |