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 QObject *QMetaObject::newInstance(Args &&... arguments) const diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index ed5561b923..6aa2d46782 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -78,7 +78,7 @@ struct QMethodRawArguments void **arguments; }; -#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) class Q_CORE_EXPORT QGenericArgument { public: @@ -485,7 +485,7 @@ struct Q_CORE_EXPORT QMetaObject #endif -#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0) +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) QObject *newInstance(QGenericArgument val0, QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(),