diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-02-24 10:13:03 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-02-28 12:29:12 +0100 |
| commit | 35041077dfcc8afd69b7404d7dae27f3e3745d4a (patch) | |
| tree | c237a813f90a9f9e00324d93502b6906606705cb /src/qml/qml/qqml.cpp | |
| parent | ce6452ca5accb3a710376c155d6832746745cf20 (diff) | |
QtQml: Make QQmlTypeNotAvailable public
Since we are exposing it in the type registration macros, we need to
make it visible to the compiler.
Pick-to: 6.5
Fixes: QTBUG-111477
Change-Id: I3dbefd617f00de6e97585d105c612bbc33d0224d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.cpp')
| -rw-r--r-- | src/qml/qml/qqml.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index 13654d0cb0..37eb52755e 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -11,7 +11,6 @@ #include <private/qqmlmetatypedata_p.h> #include <private/qqmltype_p_p.h> #include <private/qqmltypemodule_p.h> -#include <private/qqmltypenotavailable_p.h> #include <private/qqmlcomponent_p.h> #include <private/qqmltypewrapper_p.h> #include <private/qqmlvaluetypewrapper_p.h> @@ -755,6 +754,13 @@ QList<QTypeRevision> QQmlPrivate::revisionClassInfos(const QMetaObject *metaObje return revisions; } +int qmlRegisterTypeNotAvailable( + const char *uri, int versionMajor, int versionMinor, + const char *qmlName, const QString &message) +{ + return qmlRegisterUncreatableType<QQmlTypeNotAvailable>( + uri, versionMajor, versionMinor, qmlName, message); +} namespace QQmlPrivate { template<> @@ -798,7 +804,6 @@ void qmlRegisterTypeAndRevisions<QQmlTypeNotAvailable, void>( qmlregister(TypeAndRevisionsRegistration, &type); } - QQmlEngine *AOTCompiledContext::qmlEngine() const { return qmlContext ? qmlContext->engine() : nullptr; |