diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-08 13:10:53 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-12 12:50:37 +0100 |
| commit | 4786eb0b0f2c90c0e5f456fd51cca51ddf44531c (patch) | |
| tree | ed7db8d0d8ded199be3cd1b5054c5a8f9c56708d /src/qml/qml | |
| parent | 7318e939c57c5904517ff7f2563285d7a7fddd67 (diff) | |
Remove the explicit declaration of QQmlComponent::createObject(QQmlV4Function *)
Now when manual moc provides the required QT_DISABLE_DEPRECATED_UP_TO
definition we don't need to declare the
QQmlComponent::createObject(QQmlV4Function *) for moc explicitly.
Also we need to manually add imported dependencies of Qt6::Qml to
make sure that we passed to moc all the required frameworks on the
Apple platforms.
Fixes: QTBUG-104898
Change-Id: I5404808b2589463d1b0ea5884f40e8e67cd5cb0e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jari Helaakoski <jari.helaakoski@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h index d5e65e21b8..e435aa2894 100644 --- a/src/qml/qml/qqmlcomponent.h +++ b/src/qml/qml/qqmlcomponent.h @@ -100,10 +100,7 @@ Q_SIGNALS: protected: QQmlComponent(QQmlComponentPrivate &dd, QObject* parent); -#if defined(Q_MOC_RUN) - // TODO: moc on macOS cannot decipher the deprecation below - Q_INVOKABLE void createObject(QQmlV4Function *); -#elif QT_DEPRECATED_SINCE(6, 3) +#if QT_DEPRECATED_SINCE(6, 3) QT_DEPRECATED_X("Use the overload with proper arguments") Q_INVOKABLE void createObject(QQmlV4Function *); #endif |