diff options
Diffstat (limited to 'src/qml/qml')
30 files changed, 458 insertions, 485 deletions
diff --git a/src/qml/qml/ftw/qqmlnullablevalue_p.h b/src/qml/qml/ftw/qqmlnullablevalue_p.h index 9a3f032b68..62899e4644 100644 --- a/src/qml/qml/ftw/qqmlnullablevalue_p.h +++ b/src/qml/qml/ftw/qqmlnullablevalue_p.h @@ -30,7 +30,7 @@ struct QQmlNullableValue {} QQmlNullableValue(QQmlNullableValue<T> &&o) noexcept - : m_value(std::move(o.value)) + : m_value(std::move(o.m_value)) , m_isNull(std::exchange(o.m_isNull, true)) {} diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index eb716671b1..63e67ac804 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -10,7 +10,7 @@ #include <private/qqmlcomponent_p.h> #include <private/qqmlengine_p.h> #include <private/qqmlfinalizer_p.h> -#include <private/qqmlloggingcategory_p.h> +#include <private/qqmlloggingcategorybase_p.h> #include <private/qqmlmetatype_p.h> #include <private/qqmlmetatypedata_p.h> #include <private/qqmltype_p_p.h> @@ -1677,10 +1677,10 @@ const QLoggingCategory *AOTCompiledContext::resolveLoggingCategory(QObject *wrap { if (wrapper) { // We have to check this here because you may pass a plain QObject that only - // turns out to be a QQmlLoggingCategory at run time. - if (QQmlLoggingCategory *qQmlLoggingCategory - = qobject_cast<QQmlLoggingCategory *>(wrapper)) { - QLoggingCategory *loggingCategory = qQmlLoggingCategory->category(); + // turns out to be a QQmlLoggingCategoryBase at run time. + if (QQmlLoggingCategoryBase *qQmlLoggingCategory + = qobject_cast<QQmlLoggingCategoryBase *>(wrapper)) { + const QLoggingCategory *loggingCategory = qQmlLoggingCategory->category(); *ok = true; if (!loggingCategory) { engine->handle()->throwError( diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 47f8e5c429..4dfee0a3c6 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -533,7 +533,8 @@ Q_NEVER_INLINE bool QQmlBinding::slowWrite(const QQmlPropertyData &core, delayedError()->setErrorDescription(QLatin1String("Unable to assign [undefined] to ") + typeName); return false; - } else if (const QV4::FunctionObject *f = result.as<QV4::FunctionObject>()) { + } else if (const QV4::FunctionObject *f = result.as<QV4::FunctionObject>(); + f && !f->as<QV4::QQmlTypeWrapper>()) { if (f->isBinding()) delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration.")); else diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 3f9ce26764..0bac2f45a2 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -62,7 +62,8 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(const QObject *target, int function += QLatin1String(") { ") + expression + QLatin1String(" })"); QV4::Scope valueScope(v4); - QV4::ScopedFunctionObject f(valueScope, evalFunction(context(), scopeObject(), function, fileName, line)); + QV4::Scoped<QV4::JavaScriptFunctionObject> f( + valueScope, evalFunction(context(), scopeObject(), function, fileName, line)); QV4::ScopedContext context(valueScope, f->scope()); setupFunction(context, f->function()); } @@ -107,7 +108,7 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(const QObject *target, int // we need to run the outer function to get the nested one. if (function->isClosureWrapper()) { bool isUndefined = false; - QV4::ScopedFunctionObject result( + QV4::Scoped<QV4::JavaScriptFunctionObject> result( valueScope, QQmlJavaScriptExpression::evaluate(&isUndefined)); Q_ASSERT(!isUndefined); diff --git a/src/qml/qml/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp index 5c6daa0969..b736cb2f4c 100644 --- a/src/qml/qml/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/qqmlbuiltinfunctions.cpp @@ -3,48 +3,35 @@ #include "qqmlbuiltinfunctions_p.h" -#include <QtQml/qqmlcomponent.h> -#include <QtQml/qqmlfile.h> -#include <private/qqmlengine_p.h> #include <private/qqmlcomponent_p.h> -#include <private/qqmlloggingcategory_p.h> -#include <private/qqmlstringconverters_p.h> -#if QT_CONFIG(qml_locale) -#include <private/qqmllocale_p.h> -#endif -#include <private/qqmldelayedcallqueue_p.h> -#include <QFileInfo> - #include <private/qqmldebugconnector_p.h> #include <private/qqmldebugserviceinterfaces_p.h> -#include <private/qqmlglobal_p.h> - +#include <private/qqmldelayedcallqueue_p.h> +#include <private/qqmlengine_p.h> +#include <private/qqmlloggingcategorybase_p.h> #include <private/qqmlplatform_p.h> +#include <private/qqmlstringconverters_p.h> +#include <private/qv4dateobject_p.h> #include <private/qv4engine_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4include_p.h> -#include <private/qv4context_p.h> -#include <private/qv4stringobject_p.h> -#include <private/qv4dateobject_p.h> #include <private/qv4mm_p.h> -#include <private/qv4jsonobject_p.h> -#include <private/qv4objectproto_p.h> #include <private/qv4qobjectwrapper_p.h> #include <private/qv4stackframe_p.h> -#include <QtCore/qstring.h> -#include <QtCore/qdatetime.h> +#include <QtQml/qqmlfile.h> + +#include <QtCore/qcoreapplication.h> #include <QtCore/qcryptographichash.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qfileinfo.h> +#include <QtCore/qloggingcategory.h> +#include <QtCore/qpoint.h> #include <QtCore/qrect.h> #include <QtCore/qsize.h> -#include <QtCore/qpoint.h> +#include <QtCore/qstring.h> #include <QtCore/qurl.h> -#include <QtCore/qfile.h> -#include <QtCore/qcoreapplication.h> -#include <QtCore/qloggingcategory.h> - -#include <QDebug> QT_BEGIN_NAMESPACE @@ -172,6 +159,7 @@ The following functions are also on the Qt object. \li \c "android" - Android \li \c "ios" - iOS \li \c "tvos" - tvOS + \li \c "visionos" - visionOS \li \c "linux" - Linux \li \c "osx" - \macos \li \c "qnx" - QNX (since Qt 5.9.3) @@ -180,6 +168,9 @@ The following functions are also on the Qt object. \li \c "wasm" - WebAssembly \endlist + \note The property's value on \macos is "osx", regardless of Apple naming convention. + The returned value will be updated to "macos" for Qt 7. + \row \li \c platform.pluginName \li This is the name of the platform set on the QGuiApplication instance @@ -262,6 +253,9 @@ The \c status property will be updated as the operation progresses. If provided, \a callback is invoked when the operation completes. The callback is passed the same object as is returned from the Qt.include() call. + +\warning Using this function is strict mode does not actually put identifier into the +current context. */ // Qt.include() is implemented in qv4include.cpp @@ -1469,11 +1463,12 @@ use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}. */ /*! +\since 6.5 \qmlmethod Component Qt::createComponent(string moduleUri, string typeName, enumeration mode, QtObject parent) \overload Returns a \l Component object created for the type specified by \a moduleUri and \a typeName. \qml -import QtQuick +import QtQml QtObject { id: root property Component myComponent: Qt.createComponent("QtQuick", "Rectangle", Component.Asynchronous, root) @@ -1613,14 +1608,21 @@ QLocale QtObject::locale(const QString &name) const } #endif -void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *bindingFunction) +void Heap::QQmlBindingFunction::init(const QV4::JavaScriptFunctionObject *bindingFunction) { Scope scope(bindingFunction->engine()); ScopedContext context(scope, bindingFunction->scope()); - FunctionObject::init(context, bindingFunction->function()); + JavaScriptFunctionObject::init(context, bindingFunction->function()); this->bindingFunction.set(internalClass->engine, bindingFunction->d()); } +ReturnedValue QQmlBindingFunction::virtualCall( + const FunctionObject *f, const Value *, const Value *, int) +{ + // Mark this as a callable object, so that we can perform the binding magic on it. + return f->engine()->throwTypeError(QStringLiteral("Bindings must not be called directly.")); +} + QQmlSourceLocation QQmlBindingFunction::currentLocation() const { QV4::CppStackFrame *frame = engine()->currentStackFrame; @@ -1675,7 +1677,8 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction); */ QJSValue QtObject::binding(const QJSValue &function) const { - const QV4::FunctionObject *f = QJSValuePrivate::asManagedType<FunctionObject>(&function); + const QV4::JavaScriptFunctionObject *f + = QJSValuePrivate::asManagedType<JavaScriptFunctionObject>(&function); QV4::ExecutionEngine *e = v4Engine(); if (!f) { return QJSValuePrivate::fromReturnedValue( @@ -1813,7 +1816,8 @@ static ReturnedValue writeToConsole(const FunctionObject *b, const Value *argv, int start = 0; if (argc > 0) { if (const QObjectWrapper* wrapper = argv[0].as<QObjectWrapper>()) { - if (QQmlLoggingCategory* category = qobject_cast<QQmlLoggingCategory*>(wrapper->object())) { + if (QQmlLoggingCategoryBase *category + = qobject_cast<QQmlLoggingCategoryBase *>(wrapper->object())) { if (category->category()) loggingCategory = category->category(); else @@ -2138,7 +2142,7 @@ ReturnedValue GlobalExtensions::method_qsTranslate(const FunctionObject *b, cons } /*! - \qmlmethod string Qt::qsTranslateNoOp(string context, string sourceText, string disambiguation) + \qmlmethod string Qt::QT_TRANSLATE_NOOP(string context, string sourceText, string disambiguation) Marks \a sourceText for dynamic translation in the given \a context; i.e, the stored \a sourceText will not be altered. @@ -2253,7 +2257,7 @@ ReturnedValue GlobalExtensions::method_qsTr(const FunctionObject *b, const Value } /*! - \qmlmethod string Qt::qsTrNoOp(string sourceText, string disambiguation) + \qmlmethod string Qt::QT_TR_NOOP(string sourceText, string disambiguation) Marks \a sourceText for dynamic translation; i.e, the stored \a sourceText will not be altered. @@ -2334,7 +2338,7 @@ ReturnedValue GlobalExtensions::method_qsTrId(const FunctionObject *b, const Val } /*! - \qmlmethod string Qt::qsTrIdNoOp(string id) + \qmlmethod string Qt::QT_TRID_NOOP(string id) Marks \a id for dynamic translation. diff --git a/src/qml/qml/qqmlbuiltinfunctions_p.h b/src/qml/qml/qqmlbuiltinfunctions_p.h index 9ceedad28b..c2732e1aff 100644 --- a/src/qml/qml/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/qqmlbuiltinfunctions_p.h @@ -46,7 +46,6 @@ class Q_QML_EXPORT QtObject : public QObject QML_NAMED_ELEMENT(Qt) QML_SINGLETON QML_EXTENDED_NAMESPACE(Qt) - QML_ADDED_IN_VERSION(2, 0) Q_CLASSINFO("QML.StrictArguments", "true") @@ -199,10 +198,10 @@ struct ConsoleObject : Object { }; #define QQmlBindingFunctionMembers(class, Member) \ - Member(class, Pointer, FunctionObject *, bindingFunction) -DECLARE_HEAP_OBJECT(QQmlBindingFunction, FunctionObject) { + Member(class, Pointer, JavaScriptFunctionObject *, bindingFunction) +DECLARE_HEAP_OBJECT(QQmlBindingFunction, JavaScriptFunctionObject) { DECLARE_MARKOBJECTS(QQmlBindingFunction) - void init(const QV4::FunctionObject *bindingFunction); + void init(const QV4::JavaScriptFunctionObject *bindingFunction); }; } @@ -245,11 +244,14 @@ struct Q_QML_EXPORT GlobalExtensions { }; -struct QQmlBindingFunction : public QV4::FunctionObject +struct QQmlBindingFunction : public QV4::JavaScriptFunctionObject { - V4_OBJECT2(QQmlBindingFunction, FunctionObject) + V4_OBJECT2(QQmlBindingFunction, JavaScriptFunctionObject) - Heap::FunctionObject *bindingFunction() const { return d()->bindingFunction; } + static ReturnedValue virtualCall( + const FunctionObject *f, const Value *thisObject, const Value *argv, int argc); + + Heap::JavaScriptFunctionObject *bindingFunction() const { return d()->bindingFunction; } QQmlSourceLocation currentLocation() const; // from caller stack trace }; diff --git a/src/qml/qml/qqmlcontextdata_p.h b/src/qml/qml/qqmlcontextdata_p.h index c8e362ec8d..3aeabf72fa 100644 --- a/src/qml/qml/qqmlcontextdata_p.h +++ b/src/qml/qml/qqmlcontextdata_p.h @@ -292,6 +292,10 @@ public: return m_typeCompilationUnit && m_typeCompilationUnit->valueTypesAreAddressable(); } + bool valueTypesAreAssertable() const { + return m_typeCompilationUnit && m_typeCompilationUnit->valueTypesAreAssertable(); + } + private: friend class QQmlGuardedContextData; friend class QQmlContextPrivate; diff --git a/src/qml/qml/qqmldelayedcallqueue.cpp b/src/qml/qml/qqmldelayedcallqueue.cpp index efd8519a58..ead8a717f5 100644 --- a/src/qml/qml/qqmldelayedcallqueue.cpp +++ b/src/qml/qml/qqmldelayedcallqueue.cpp @@ -126,8 +126,9 @@ QV4::ReturnedValue QQmlDelayedCallQueue::addUniquelyAndExecuteLater(QV4::Executi // if it's a qobject function wrapper, guard against qobject deletion dfc.m_objectGuard = QQmlGuard<QObject>(functionData.first); dfc.m_guarded = true; - } else if (func->scope()->type == QV4::Heap::ExecutionContext::Type_QmlContext) { - QV4::QmlContext::Data *g = static_cast<QV4::QmlContext::Data *>(func->scope()); + } else if (const auto *js = func->as<QV4::JavaScriptFunctionObject>(); + js && js->scope()->type == QV4::Heap::ExecutionContext::Type_QmlContext) { + QV4::QmlContext::Data *g = static_cast<QV4::QmlContext::Data *>(js->scope()); Q_ASSERT(g->qml()->scopeObject); dfc.m_objectGuard = QQmlGuard<QObject>(g->qml()->scopeObject); dfc.m_guarded = true; diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index c7812059a1..593fce3371 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -4,57 +4,44 @@ #include "qqmlengine_p.h" #include "qqmlengine.h" -#include "qqmlcontext_p.h" -#include "qqml.h" -#include "qqmlcontext.h" -#include "qqmlscriptstring.h" -#include "qqmlglobal_p.h" -#include "qqmlnotifier_p.h" -#include "qqmlincubator.h" -#include "qqmlabstracturlinterceptor.h" - -#include <private/qqmldirparser_p.h> +#include <private/qqmlabstractbinding_p.h> #include <private/qqmlboundsignal_p.h> -#include <private/qqmljsdiagnosticmessage_p.h> -#include <private/qqmltype_p_p.h> +#include <private/qqmlcontext_p.h> +#include <private/qqmlnotifier_p.h> #include <private/qqmlpluginimporter_p.h> -#include <QtCore/qstandardpaths.h> -#include <QtCore/qmetaobject.h> -#include <QDebug> +#include <private/qqmlprofiler_p.h> +#include <private/qqmlscriptdata_p.h> +#include <private/qqmlsourcecoordinate_p.h> +#include <private/qqmltype_p.h> +#include <private/qqmltypedata_p.h> +#include <private/qqmlvmemetaobject_p.h> + +#include <private/qobject_p.h> +#include <private/qthread_p.h> + +#include <QtQml/qqml.h> +#include <QtQml/qqmlcomponent.h> +#include <QtQml/qqmlcontext.h> +#include <QtQml/qqmlincubator.h> +#include <QtQml/qqmlscriptstring.h> + #include <QtCore/qcoreapplication.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qdir.h> +#include <QtCore/qmetaobject.h> #include <QtCore/qmutex.h> +#include <QtCore/qstandardpaths.h> #include <QtCore/qthread.h> -#include <private/qthread_p.h> -#include <private/qqmlscriptdata_p.h> -#include <QtQml/private/qqmlcomponentattached_p.h> -#include <QtQml/private/qqmlsourcecoordinate_p.h> -#include <QtQml/private/qqmlcomponent_p.h> #if QT_CONFIG(qml_network) -#include "qqmlnetworkaccessmanagerfactory.h" -#include <QNetworkAccessManager> -#endif - -#include <private/qobject_p.h> -#include <private/qmetaobject_p.h> -#if QT_CONFIG(qml_locale) -#include <private/qqmllocale_p.h> -#endif -#include <private/qqmlbind_p.h> -#include <private/qqmlconnections_p.h> -#if QT_CONFIG(qml_animation) -#include <private/qqmltimer_p.h> +#include <QtQml/qqmlnetworkaccessmanagerfactory.h> +#include <QtNetwork/qnetworkaccessmanager.h> #endif -#include <private/qqmlplatform_p.h> -#include <private/qqmlloggingcategory_p.h> -#include <private/qv4sequenceobject_p.h> #ifdef Q_OS_WIN // for %APPDATA% # include <qt_windows.h> # include <shlobj.h> -# include <qlibrary.h> +# include <QtCore/qlibrary.h> # ifndef CSIDL_APPDATA # define CSIDL_APPDATA 0x001a // <username>\Application Data # endif @@ -1945,7 +1932,7 @@ void QQmlEnginePrivate::executeRuntimeFunction(const QV4::ExecutableCompilationU // different version of ExecutionEngine::callInContext() that returns a // QV4::ReturnedValue with no arguments since they are not needed by the // outer function anyhow - QV4::ScopedFunctionObject result(scope, + QV4::Scoped<QV4::JavaScriptFunctionObject> result(scope, v4->callInContext(function, thisObject, callContext, 0, nullptr)); Q_ASSERT(result->function()); Q_ASSERT(result->function()->compilationUnit == function->compilationUnit); @@ -2042,7 +2029,7 @@ static inline QString shellNormalizeFileName(const QString &name) bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) { -#if defined(Q_OS_MAC) || defined(Q_OS_WIN) +#if defined(Q_OS_DARWIN) || defined(Q_OS_WIN) QFileInfo info(fileName); const QString absolute = info.absoluteFilePath(); diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 1273067187..2e3fa5f86c 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -415,6 +415,10 @@ static QVariant byProperties( if (source.metaType() == QMetaType::fromType<QJSValue>()) { QJSValue val = source.value<QJSValue>(); + // Generally, the GC might collect a Value at any point so that + // a `ScopedValue` should be used. + // In this case, the Value is tied to a `QJSValue` which is + // persistent to the GC and thus the cast is safe. return byProperties( targetMetaObject, targetMetaType, QV4::Value(QJSValuePrivate::asReturnedValue(&val))); } @@ -560,6 +564,10 @@ bool QQmlValueTypeProvider::populateValueType( { if (sourceMetaType == QMetaType::fromType<QJSValue>()) { const QJSValue *val = static_cast<const QJSValue *>(source); + // Generally, the GC might collect a Value at any point so that + // a `ScopedValue` should be used. + // In this case, the Value is tied to a `QJSValue` which is + // persistent to the GC and thus the cast is safe. return populateValueType( targetMetaType, target, QV4::Value(QJSValuePrivate::asReturnedValue(val))); } diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 98fe2e6a79..5aa2f3ee6f 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -270,7 +270,6 @@ class Q_QML_EXPORT QQmlApplication : public QObject Q_PROPERTY(QString organization READ organization WRITE setOrganization NOTIFY organizationChanged) Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged) QML_ANONYMOUS - QML_ADDED_IN_VERSION(2, 0) public: QQmlApplication(QObject* parent=nullptr); diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 86380294ba..217cb44669 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1516,8 +1516,9 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) // 6. $QML_IMPORT_PATH // 7. QLibraryInfo::QmlImportsPath - QString installImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); - addImportPath(installImportsPath); + const auto paths = QLibraryInfo::paths(QLibraryInfo::QmlImportsPath); + for (const auto &installImportsPath: paths) + addImportPath(installImportsPath); auto addEnvImportPath = [this](const char *var) { if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty(var))) { diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp index b29ce185ef..e1019b804f 100644 --- a/src/qml/qml/qqmlirloader.cpp +++ b/src/qml/qml/qqmlirloader.cpp @@ -85,6 +85,8 @@ void QQmlIRLoader::load() valueTypeBehavior |= Pragma::Copy; if (unit->flags & QV4::CompiledData::Unit::ValueTypesAddressable) valueTypeBehavior |= Pragma::Addressable; + if (unit->flags & QV4::CompiledData::Unit::ValueTypesAssertable) + valueTypeBehavior |= Pragma::Assertable; if (valueTypeBehavior) createValueTypePragma(Pragma::ValueTypeBehavior, valueTypeBehavior); diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 5d26bf8a68..82c65ccf82 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -54,13 +54,14 @@ private: static QV4::ReturnedValue method_toLocaleCurrencyString(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); }; - -namespace QQmlLocale +// This needs to be a struct so that we can derive from QLocale and inherit its enums. Then we can +// use it as extension in QQmlLocaleEnums and expose all the enums in one go, without duplicating +// any in different qmltypes files. +struct Q_QML_EXPORT QQmlLocale : public QLocale { - Q_NAMESPACE_EXPORT(Q_QML_EXPORT) - QML_NAMED_ELEMENT(Locale) - QML_ADDED_IN_VERSION(2, 2) - QML_NAMESPACE_EXTENDED(QLocale) + Q_GADGET + QML_ANONYMOUS +public: // Qt defines Sunday as 7, but JS Date assigns Sunday 0 enum DayOfWeek { @@ -72,11 +73,13 @@ namespace QQmlLocale Friday = Qt::Friday, Saturday = Qt::Saturday }; - Q_ENUM_NS(DayOfWeek) + Q_ENUM(DayOfWeek) - Q_QML_EXPORT QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); - Q_QML_EXPORT void registerStringLocaleCompare(QV4::ExecutionEngine *engine); - Q_QML_EXPORT QV4::ReturnedValue method_localeCompare(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); + static QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); + static void registerStringLocaleCompare(QV4::ExecutionEngine *engine); + static QV4::ReturnedValue method_localeCompare( + const QV4::FunctionObject *, const QV4::Value *thisObject, + const QV4::Value *argv, int argc); }; struct DayOfWeekList diff --git a/src/qml/qml/qqmlloggingcategory.cpp b/src/qml/qml/qqmlloggingcategory.cpp deleted file mode 100644 index 8d7fd6c04d..0000000000 --- a/src/qml/qml/qqmlloggingcategory.cpp +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright (C) 2016 Pelagicore AG -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#include "qqmlloggingcategory_p.h" - -#include <QtQml/qqmlinfo.h> - -#include <memory> - -/*! - \qmltype LoggingCategory - \ingroup qml-utility-elements - \inqmlmodule QtQml - \brief Defines a logging category in QML. - \since 5.8 - - A logging category can be passed to console.log() and friends as the first argument. - If supplied to the logger the LoggingCategory's name will be used as logging category. - Otherwise the default logging category will be used. - - \qml - import QtQuick - - Item { - LoggingCategory { - id: category - name: "com.qt.category" - defaultLogLevel: LoggingCategory.Warning - } - - Component.onCompleted: { - console.log(category, "log message"); - console.warn(category, "warning message"); - } - } - \endqml - - By default this outputs only \c{com.qt.category: warning message}. The - \c{log message} is suppressed due to the \l{defaultLogLevel}. You can, - however, configure log levels for QML logging categories the same way - you can configure them for - \l{QLoggingCategory#configuring-categories}{QLoggingCategory}. - - \note As the creation of objects is expensive, it is encouraged to put the needed - LoggingCategory definitions into a singleton and import this where needed. - - \sa QLoggingCategory -*/ - -/*! - \qmlproperty string QtQml::LoggingCategory::name - - Holds the name of the logging category. - - \note This property needs to be set when declaring the LoggingCategory - and cannot be changed later. - - \sa QLoggingCategory::categoryName() -*/ - -/*! - \qmlproperty enumeration QtQml::LoggingCategory::defaultLogLevel - \since 5.12 - - Holds the default log level of the logging category. By default it is - created with the LoggingCategory.Debug log level. - - The following enumeration values are available: - \list - \li LoggingCategory.Debug - \li LoggingCategory.Info - \li LoggingCategory.Warning - \li LoggingCategory.Critical - \li LoggingCategory.Fatal - \endlist - - They mirror the values of the \l{QtMsgType} enumeration. - - \note This property needs to be set when declaring the LoggingCategory - and cannot be changed later. - - \sa QtMsgType -*/ - -QQmlLoggingCategory::QQmlLoggingCategory(QObject *parent) - : QObject(parent) - , m_initialized(false) -{ -} - -QQmlLoggingCategory::~QQmlLoggingCategory() -{ -} - -QString QQmlLoggingCategory::name() const -{ - return QString::fromUtf8(m_name); -} - -QQmlLoggingCategory::DefaultLogLevel QQmlLoggingCategory::defaultLogLevel() const -{ - return m_defaultLogLevel; -} - -QLoggingCategory *QQmlLoggingCategory::category() const -{ - return m_category.get(); -} - -void QQmlLoggingCategory::classBegin() -{ -} - -void QQmlLoggingCategory::componentComplete() -{ - m_initialized = true; - if (m_name.isNull()) { - qmlWarning(this) << QLatin1String("Declaring the name of a LoggingCategory is mandatory and cannot be changed later"); - } else { - auto category = std::make_unique<QLoggingCategory>(m_name.constData(), QtMsgType(m_defaultLogLevel)); - m_category.swap(category); - } -} - -void QQmlLoggingCategory::setDefaultLogLevel(DefaultLogLevel defaultLogLevel) -{ - if (m_defaultLogLevel == defaultLogLevel) - return; - - if (m_initialized) { - qmlWarning(this) << QLatin1String("The defaultLogLevel of a LoggingCategory cannot be changed after the component is completed"); - return; - } - - m_defaultLogLevel = defaultLogLevel; -} - -void QQmlLoggingCategory::setName(const QString &name) -{ - const QByteArray newName = name.toUtf8(); - - if (m_name == newName) - return; - - if (m_initialized) { - qmlWarning(this) << QLatin1String("The name of a LoggingCategory cannot be changed after the component is completed"); - return; - } - - m_name = newName; -} - -#include "moc_qqmlloggingcategory_p.cpp" diff --git a/src/qml/qml/qqmlloggingcategory_p.h b/src/qml/qml/qqmlloggingcategory_p.h deleted file mode 100644 index 4a27e7e1d7..0000000000 --- a/src/qml/qml/qqmlloggingcategory_p.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (C) 2016 Pelagicore AG -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#ifndef QQMLLOGGINGCATEGORY_P_H -#define QQMLLOGGINGCATEGORY_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/qobject.h> -#include <QtCore/qstring.h> -#include <QtCore/qloggingcategory.h> - -#include <QtQml/qqmlparserstatus.h> -#include <QtQml/qqml.h> -#include <QtCore/private/qglobal_p.h> - -#include <memory> - -QT_BEGIN_NAMESPACE - -class QQmlLoggingCategory : public QObject, public QQmlParserStatus -{ - Q_OBJECT - Q_INTERFACES(QQmlParserStatus) - - Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(DefaultLogLevel defaultLogLevel READ defaultLogLevel WRITE setDefaultLogLevel REVISION(2, 12)) - QML_NAMED_ELEMENT(LoggingCategory) - QML_ADDED_IN_VERSION(2, 8) - -public: - enum DefaultLogLevel { - Debug = QtDebugMsg, - Info = QtInfoMsg, - Warning = QtWarningMsg, - Critical = QtCriticalMsg, - Fatal = QtFatalMsg - }; - Q_ENUM(DefaultLogLevel); - - QQmlLoggingCategory(QObject *parent = nullptr); - virtual ~QQmlLoggingCategory(); - - DefaultLogLevel defaultLogLevel() const; - void setDefaultLogLevel(DefaultLogLevel defaultLogLevel); - QString name() const; - void setName(const QString &name); - - QLoggingCategory *category() const; - - void classBegin() override; - void componentComplete() override; - -private: - QByteArray m_name; - std::unique_ptr<QLoggingCategory> m_category; - DefaultLogLevel m_defaultLogLevel = Debug; - bool m_initialized; -}; - -QT_END_NAMESPACE - -#endif // QQMLLOGGINGCATEGORY_H diff --git a/src/qml/qml/qqmlloggingcategorybase_p.h b/src/qml/qml/qqmlloggingcategorybase_p.h new file mode 100644 index 0000000000..4a3c4cf6aa --- /dev/null +++ b/src/qml/qml/qqmlloggingcategorybase_p.h @@ -0,0 +1,47 @@ +// Copyright (C) 2024 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#ifndef QQMLLOGGINGCATEGORYBASE_P_H +#define QQMLLOGGINGCATEGORYBASE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtQml/qqml.h> + +#include <QtCore/qobject.h> +#include <QtCore/qloggingcategory.h> + +#include <memory> + +QT_BEGIN_NAMESPACE + +class Q_QML_EXPORT QQmlLoggingCategoryBase : public QObject +{ + Q_OBJECT + QML_ANONYMOUS + +public: + QQmlLoggingCategoryBase(QObject *parent = nullptr) : QObject(parent) {} + + const QLoggingCategory *category() const { return m_category.get(); } + void setCategory(const char *name, QtMsgType type) + { + m_category = std::make_unique<QLoggingCategory>(name, type); + } + +private: + std::unique_ptr<QLoggingCategory> m_category; +}; + +QT_END_NAMESPACE + +#endif // QQMLLOGGINGCATEGORYBASE_P_H diff --git a/src/qml/qml/qqmlmetamoduleregistration.cpp b/src/qml/qml/qqmlmetamoduleregistration.cpp deleted file mode 100644 index 8e55b62b3a..0000000000 --- a/src/qml/qml/qqmlmetamoduleregistration.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#include <private/qtqmlglobal_p.h> -#include <qqmlmoduleregistration.h> -#include <qqml.h> - -QT_BEGIN_NAMESPACE - -// Provide the type registration for QtQml here, in libQtQml.so. -// This way we get a completely functional QtQml module and don't have to -// rely on the plugin to be loaded. -// In CMakeLists.txt we've specified NO_GENERATE_QMLTYPES to prevent -// the generation of an extra type registration file. -Q_QML_EXPORT void qml_register_types_QtQml() -{ - // ### Qt7: Handle version 6 like version 2. - qmlRegisterModule("QtQml", 2, 0); - qmlRegisterModule("QtQml", 2, 254); - qmlRegisterModule("QtQml", QT_VERSION_MAJOR, 0); - qmlRegisterModule("QtQml", QT_VERSION_MAJOR, QT_VERSION_MINOR); -} - -static const QQmlModuleRegistration registration("QtQml", qml_register_types_QtQml); - -QT_END_NAMESPACE diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index dbd54b5f11..dd52ee2090 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -22,13 +22,18 @@ QQmlPlatform::~QQmlPlatform() QString QQmlPlatform::os() { + // ### Qt7: Consider implementing in terms of QSysInfo + #if defined(Q_OS_ANDROID) return QStringLiteral("android"); #elif defined(Q_OS_IOS) return QStringLiteral("ios"); #elif defined(Q_OS_TVOS) return QStringLiteral("tvos"); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_VISIONOS) + return QStringLiteral("visionos"); +#elif defined(Q_OS_MACOS) + // ### Qt7: Replace with "macos" return QStringLiteral("osx"); #elif defined(Q_OS_WIN) return QStringLiteral("windows"); diff --git a/src/qml/qml/qqmlplatform_p.h b/src/qml/qml/qqmlplatform_p.h index b8d2167fd5..9905f6330c 100644 --- a/src/qml/qml/qqmlplatform_p.h +++ b/src/qml/qml/qqmlplatform_p.h @@ -27,7 +27,6 @@ class Q_QML_EXPORT QQmlPlatform : public QObject Q_PROPERTY(QString os READ os CONSTANT) Q_PROPERTY(QString pluginName READ pluginName CONSTANT) QML_ANONYMOUS - QML_ADDED_IN_VERSION(2, 0) public: explicit QQmlPlatform(QObject *parent = nullptr); diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h index 0878034bab..cbe5eb21ad 100644 --- a/src/qml/qml/qqmlproperty.h +++ b/src/qml/qml/qqmlproperty.h @@ -23,7 +23,6 @@ class Q_QML_EXPORT QQmlProperty { Q_GADGET QML_ANONYMOUS - QML_ADDED_IN_VERSION(2, 15) Q_PROPERTY(QObject *object READ object CONSTANT FINAL) Q_PROPERTY(QString name READ name CONSTANT FINAL) diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index a225f94a3f..805113ad97 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -95,7 +95,6 @@ void QQmlPropertyData::load(const QMetaMethod &m) case QMetaMethod::Constructor: m_flags.setIsSignal(false); m_flags.setIsConstructor(true); - setPropType(QMetaType::fromType<QObject *>()); break; default: m_flags.setIsSignal(false); @@ -687,28 +686,9 @@ const QQmlPropertyData *QQmlPropertyCache::findProperty( return nullptr; } -QString QQmlPropertyData::name(QObject *object) const -{ - if (!object) - return QString(); - - return name(object->metaObject()); -} -QString QQmlPropertyData::name(const QMetaObject *metaObject) const -{ - if (!metaObject || coreIndex() == -1) - return QString(); - if (isFunction()) { - QMetaMethod m = metaObject->method(coreIndex()); - return QString::fromUtf8(m.name().constData()); - } else { - QMetaProperty p = metaObject->property(coreIndex()); - return QString::fromUtf8(p.name()); - } -} bool QQmlPropertyData::markAsOverrideOf(QQmlPropertyData *predecessor) { diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h index 0fa7984f05..bdfa41ab7a 100644 --- a/src/qml/qml/qqmlpropertydata_p.h +++ b/src/qml/qml/qqmlpropertydata_p.h @@ -338,8 +338,17 @@ public: static Flags flagsForProperty(const QMetaProperty &); void load(const QMetaProperty &); void load(const QMetaMethod &); - QString name(QObject *) const; - QString name(const QMetaObject *) const; + + QString name(QObject *object) const { return object ? name(object->metaObject()) : QString(); } + QString name(const QMetaObject *metaObject) const + { + if (!metaObject || m_coreIndex == -1) + return QString(); + + return QString::fromUtf8(isFunction() + ? metaObject->method(m_coreIndex).name().constData() + : metaObject->property(m_coreIndex).name()); + } bool markAsOverrideOf(QQmlPropertyData *predecessor); diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index 0d8786a9df..2ab81102c7 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -3,63 +3,122 @@ #include "qqmltypewrapper_p.h" -#include <private/qqmlengine_p.h> +#include <private/qjsvalue_p.h> + #include <private/qqmlcontext_p.h> +#include <private/qqmlengine_p.h> #include <private/qqmlmetaobject_p.h> #include <private/qqmltypedata_p.h> #include <private/qqmlvaluetypewrapper_p.h> -#include <private/qjsvalue_p.h> -#include <private/qv4functionobject_p.h> -#include <private/qv4objectproto_p.h> -#include <private/qv4qobjectwrapper_p.h> #include <private/qv4identifiertable_p.h> #include <private/qv4lookup_p.h> +#include <private/qv4objectproto_p.h> +#include <private/qv4qobjectwrapper_p.h> +#include <private/qv4symbol_p.h> QT_BEGIN_NAMESPACE using namespace QV4; DEFINE_OBJECT_VTABLE(QQmlTypeWrapper); +DEFINE_OBJECT_VTABLE(QQmlTypeConstructor); DEFINE_OBJECT_VTABLE(QQmlScopedEnumWrapper); void Heap::QQmlTypeWrapper::init(TypeNameMode m, QObject *o, const QQmlTypePrivate *type) { Q_ASSERT(type); - Object::init(); - mode = m; + FunctionObject::init(); + flags = quint8(m) | quint8(Type); object.init(o); - typePrivate = type; - QQmlType::refHandle(typePrivate); + QQmlType::refHandle(type); + t.typePrivate = type; } void Heap::QQmlTypeWrapper::init( TypeNameMode m, QObject *o, QQmlTypeNameCache *type, const QQmlImportRef *import) { Q_ASSERT(type); - Object::init(); - mode = m; + FunctionObject::init(); + flags = quint8(m) | quint8(Namespace); object.init(o); - typeNamespace = type; - typeNamespace->addref(); - importNamespace = import; + n.typeNamespace = type; + n.typeNamespace->addref(); + n.importNamespace = import; } void Heap::QQmlTypeWrapper::destroy() { - Q_ASSERT(typePrivate || typeNamespace); - QQmlType::derefHandle(typePrivate); - typePrivate = nullptr; - if (typeNamespace) - typeNamespace->release(); + switch (kind()) { + case Type: + Q_ASSERT(t.typePrivate); + QQmlType::derefHandle(t.typePrivate); + delete[] t.constructors; + break; + case Namespace: + Q_ASSERT(n.typeNamespace); + n.typeNamespace->release(); + break; + } + object.destroy(); - Object::destroy(); + FunctionObject::destroy(); } QQmlType Heap::QQmlTypeWrapper::type() const { - return QQmlType(typePrivate); + switch (kind()) { + case Type: + return QQmlType(t.typePrivate); + case Namespace: + return QQmlType(); + } + + Q_UNREACHABLE_RETURN(QQmlType()); +} + +QQmlTypeNameCache::Result Heap::QQmlTypeWrapper::queryNamespace( + const QV4::String *name, QQmlEnginePrivate *enginePrivate) const +{ + Q_ASSERT(kind() == Namespace); + Q_ASSERT(n.typeNamespace); + Q_ASSERT(n.importNamespace); + return n.typeNamespace->query(name, n.importNamespace, QQmlTypeLoader::get(enginePrivate)); + +} + +template<typename Callback> +void warnWithLocation(const Heap::QQmlTypeWrapper *wrapper, Callback &&callback) +{ + auto log = qWarning().noquote().nospace(); + if (const CppStackFrame *frame = wrapper->internalClass->engine->currentStackFrame) + log << frame->source() << ':' << frame->lineNumber() << ':'; + callback(log.space()); +} + +void Heap::QQmlTypeWrapper::warnIfUncreatable() const +{ + const QQmlType t = type(); + Q_ASSERT(t.isValid()); + + if (t.isValueType()) + return; + + if (t.isSingleton()) { + warnWithLocation(this, [&](QDebug &log) { + log << "You are calling a Q_INVOKABLE constructor of" << t.typeName() + << "which is a singleton in QML."; + }); + return; + } + + if (!t.isCreatable()) { + warnWithLocation(this, [&](QDebug &log) { + log << "You are calling a Q_INVOKABLE constructor of" << t.typeName() + << "which is uncreatable in QML."; + }); + } } bool QQmlTypeWrapper::isSingleton() const @@ -136,17 +195,59 @@ QVariant QQmlTypeWrapper::toVariant() const return QVariant::fromValue<QObject*>(e->singletonInstance<QObject*>(type)); } +ReturnedValue QQmlTypeWrapper::method_hasInstance( + const FunctionObject *, const Value *thisObject, const Value *argv, int argc) +{ + // we want to immediately call instanceOf rather than going through Function + + if (!argc) + return Encode(false); + if (const Object *o = thisObject->as<Object>()) + return o->instanceOf(argv[0]); + return Encode(false); +} + +ReturnedValue QQmlTypeWrapper::method_toString( + const FunctionObject *b, const Value *thisObject, const Value *, int) +{ + const QQmlTypeWrapper *typeWrapper = thisObject->as<QQmlTypeWrapper>(); + if (!typeWrapper) + RETURN_UNDEFINED(); + + const QString name = typeWrapper->d()->type().qmlTypeName(); + return Encode(b->engine()->newString(name.isEmpty() + ? QLatin1String("Unknown Type") + : name)); +} + +void QQmlTypeWrapper::initProto(ExecutionEngine *v4) +{ + if (v4->typeWrapperPrototype()->d_unchecked()) + return; + + Scope scope(v4); + ScopedObject o(scope, v4->newObject()); + + o->defineDefaultProperty(v4->symbol_hasInstance(), method_hasInstance, 1, Attr_ReadOnly); + o->defineDefaultProperty(v4->id_toString(), method_toString, 0); + o->setPrototypeOf(v4->functionPrototype()); + + v4->jsObjects[QV4::ExecutionEngine::TypeWrapperProto] = o->d(); +} // Returns a type wrapper for type t on o. This allows access of enums, and attached properties. ReturnedValue QQmlTypeWrapper::create(QV4::ExecutionEngine *engine, QObject *o, const QQmlType &t, Heap::QQmlTypeWrapper::TypeNameMode mode) { Q_ASSERT(t.isValid()); - Scope scope(engine); + initProto(engine); - Scoped<QQmlTypeWrapper> w(scope, engine->memoryManager->allocate<QQmlTypeWrapper>( - mode, o, t.priv())); - return w.asReturnedValue(); + QV4::MemoryManager *mm = engine->memoryManager; + + if (const QMetaObject *mo = t.metaObject(); !mo || mo->constructorCount() == 0) + return mm->allocate<QQmlTypeWrapper>(mode, o, t.priv())->asReturnedValue(); + + return mm->allocate<QQmlTypeConstructor>(mode, o, t.priv())->asReturnedValue(); } // Returns a type wrapper for importNamespace (of t) on o. This allows nested resolution of a type in a @@ -157,6 +258,8 @@ ReturnedValue QQmlTypeWrapper::create( { Q_ASSERT(t); Q_ASSERT(importNamespace); + initProto(engine); + Scope scope(engine); Scoped<QQmlTypeWrapper> w(scope, engine->memoryManager->allocate<QQmlTypeWrapper>( @@ -203,7 +306,8 @@ ReturnedValue QQmlTypeWrapper::virtualGet(const Managed *m, PropertyKey id, cons if (type.isQObjectSingleton() || type.isCompositeSingleton()) { if (QObject *qobjectSingleton = enginePrivate->singletonInstance<QObject*>(type)) { // check for enum value - const bool includeEnums = w->d()->mode == Heap::QQmlTypeWrapper::IncludeEnums; + const bool includeEnums + = w->d()->typeNameMode() == Heap::QQmlTypeWrapper::IncludeEnums; if (includeEnums && name->startsWithUpper()) { bool ok = false; int value = enumForSingleton(v4, name, type, &ok); @@ -278,14 +382,11 @@ ReturnedValue QQmlTypeWrapper::virtualGet(const Managed *m, PropertyKey id, cons // Fall through to base implementation - } else if (w->d()->typeNamespace) { - Q_ASSERT(w->d()->importNamespace); - QQmlTypeNameCache::Result r = w->d()->typeNamespace->query( - name, w->d()->importNamespace, QQmlTypeLoader::get(enginePrivate)); - + } else if (w->d()->kind() == Heap::QQmlTypeWrapper::Namespace) { + const QQmlTypeNameCache::Result r = w->d()->queryNamespace(name, enginePrivate); if (r.isValid()) { if (r.type.isValid()) { - return create(scope.engine, object, r.type, w->d()->mode); + return create(scope.engine, object, r.type, w->d()->typeNameMode()); } else if (r.scriptIndex != -1) { QV4::ScopedObject scripts(scope, context->importedScripts().valueRef()); return scripts->get(r.scriptIndex); @@ -389,15 +490,16 @@ bool QQmlTypeWrapper::virtualIsEqualTo(Managed *a, Managed *b) return false; } -static ReturnedValue instanceOfQObject(const QV4::QQmlTypeWrapper *typeWrapper, const QObjectWrapper *objectWrapper) +static ReturnedValue instanceOfQObject( + const QV4::QQmlTypeWrapper *typeWrapper, QObject *wrapperObject) { QV4::ExecutionEngine *engine = typeWrapper->internalClass()->engine; // in case the wrapper outlived the QObject* - const QObject *wrapperObject = objectWrapper->object(); if (!wrapperObject) return engine->throwTypeError(); - const QMetaType myTypeId = typeWrapper->d()->type().typeId(); + const QQmlType type = typeWrapper->d()->type(); + const QMetaType myTypeId = type.typeId(); QQmlMetaObject myQmlType; if (!myTypeId.isValid()) { // we're a composite type; a composite type cannot be equal to a @@ -422,7 +524,12 @@ static ReturnedValue instanceOfQObject(const QV4::QQmlTypeWrapper *typeWrapper, const QMetaObject *theirType = wrapperObject->metaObject(); - return QV4::Encode(QQmlMetaObject::canConvert(theirType, myQmlType)); + if (QQmlMetaObject::canConvert(theirType, myQmlType)) + return Encode(true); + else if (type.isValueType()) + return Encode::undefined(); + else + return Encode(false); } ReturnedValue QQmlTypeWrapper::virtualInstanceOf(const Object *typeObject, const Value &var) @@ -431,21 +538,46 @@ ReturnedValue QQmlTypeWrapper::virtualInstanceOf(const Object *typeObject, const const QV4::QQmlTypeWrapper *typeWrapper = static_cast<const QV4::QQmlTypeWrapper *>(typeObject); if (const QObjectWrapper *objectWrapper = var.as<QObjectWrapper>()) - return instanceOfQObject(typeWrapper, objectWrapper); + return instanceOfQObject(typeWrapper, objectWrapper->object()); + + if (const QQmlTypeWrapper *varTypeWrapper = var.as<QQmlTypeWrapper>()) { + // Singleton or attachment + if (QObject *varObject = varTypeWrapper->object()) + return instanceOfQObject(typeWrapper, varObject); + } const QQmlType type = typeWrapper->d()->type(); - if (type.isValueType()) { + + // If the target type is an object type we want null. + if (!type.isValueType()) + return Encode(false); + + const auto canCastValueType = [&]() -> bool { if (const QQmlValueTypeWrapper *valueWrapper = var.as<QQmlValueTypeWrapper>()) { - return QV4::Encode(QQmlMetaObject::canConvert(valueWrapper->metaObject(), - type.metaObjectForValueType())); + return QQmlMetaObject::canConvert( + valueWrapper->metaObject(), type.metaObjectForValueType()); } - // We want "foo as valuetype" to return undefined if it doesn't match. - return Encode::undefined(); - } + switch (type.typeId().id()) { + case QMetaType::Void: + return var.isUndefined(); + case QMetaType::QVariant: + return true; // Everything is a var + case QMetaType::Int: + return var.isInteger(); + case QMetaType::Double: + return var.isDouble(); // Integers are also doubles + case QMetaType::QString: + return var.isString(); + case QMetaType::Bool: + return var.isBoolean(); + } - // If the target type is an object type we want null. - return Encode(false); + return false; + }; + + // We want "foo as valuetype" to return undefined if it doesn't match. + return canCastValueType() ? Encode(true) : Encode::undefined(); } ReturnedValue QQmlTypeWrapper::virtualResolveLookupGetter(const Object *object, ExecutionEngine *engine, Lookup *lookup) @@ -469,7 +601,8 @@ ReturnedValue QQmlTypeWrapper::virtualResolveLookupGetter(const Object *object, QQmlEnginePrivate *e = QQmlEnginePrivate::get(engine->qmlEngine()); if (type.isQObjectSingleton() || type.isCompositeSingleton()) { if (QObject *qobjectSingleton = e->singletonInstance<QObject*>(type)) { - const bool includeEnums = w->d()->mode == Heap::QQmlTypeWrapper::IncludeEnums; + const bool includeEnums + = w->d()->typeNameMode() == Heap::QQmlTypeWrapper::IncludeEnums; if (!includeEnums || !name->startsWithUpper()) { QQmlData *ddata = QQmlData::get(qobjectSingleton, false); if (ddata && ddata->propertyCache) { diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h index 717efaf20e..fa859dd118 100644 --- a/src/qml/qml/qqmltypewrapper_p.h +++ b/src/qml/qml/qqmltypewrapper_p.h @@ -19,7 +19,8 @@ #include <QtCore/qpointer.h> #include <private/qv4value_p.h> -#include <private/qv4object_p.h> +#include <private/qv4functionobject_p.h> +#include <private/qv4qmetaobjectwrapper_p.h> QT_BEGIN_NAMESPACE @@ -32,26 +33,65 @@ namespace QV4 { namespace Heap { -struct QQmlTypeWrapper : Object { - enum TypeNameMode { - IncludeEnums, - ExcludeEnums +struct QQmlTypeWrapper : FunctionObject { + + enum TypeNameMode : quint8 { + ExcludeEnums = 0x0, + IncludeEnums = 0x1, + TypeNameModeMask = 0x1, + }; + + enum Kind : quint8 { + Type = 0x0, + Namespace = 0x2, + KindMask = 0x2 }; void init(TypeNameMode m, QObject *o, const QQmlTypePrivate *type); void init(TypeNameMode m, QObject *o, QQmlTypeNameCache *type, const QQmlImportRef *import); void destroy(); - TypeNameMode mode; - QV4QPointer<QObject> object; + + const QMetaObject *metaObject() const { return type().metaObject(); } + QMetaType metaType() const { return type().typeId(); } QQmlType type() const; + TypeNameMode typeNameMode() const { return TypeNameMode(flags & TypeNameModeMask); } + Kind kind() const { return Kind(flags & KindMask); } + + const QQmlPropertyData *ensureConstructorsCache( + const QMetaObject *metaObject, QMetaType metaType) + { + Q_ASSERT(kind() == Type); + if (!t.constructors && metaObject) { + t.constructors = QMetaObjectWrapper::createConstructors(metaObject, metaType); + warnIfUncreatable(); + } + return t.constructors; + } + void warnIfUncreatable() const; + + QQmlTypeNameCache::Result queryNamespace( + const QV4::String *name, QQmlEnginePrivate *enginePrivate) const; - const QQmlTypePrivate *typePrivate; - QQmlTypeNameCache *typeNamespace; - const QQmlImportRef *importNamespace; + QV4QPointer<QObject> object; + + union { + struct { + const QQmlTypePrivate *typePrivate; + const QQmlPropertyData *constructors; + } t; + struct { + QQmlTypeNameCache *typeNamespace; + const QQmlImportRef *importNamespace; + } n; + }; + + quint8 flags; }; +using QQmlTypeConstructor = QQmlTypeWrapper; + struct QQmlScopedEnumWrapper : Object { void init() { Object::init(); } void destroy(); @@ -62,9 +102,10 @@ struct QQmlScopedEnumWrapper : Object { } -struct Q_QML_EXPORT QQmlTypeWrapper : Object +struct Q_QML_EXPORT QQmlTypeWrapper : FunctionObject { - V4_OBJECT2(QQmlTypeWrapper, Object) + V4_OBJECT2(QQmlTypeWrapper, FunctionObject) + V4_PROTOTYPE(typeWrapperPrototype) V4_NEEDS_DESTROY bool isSingleton() const; @@ -74,6 +115,8 @@ struct Q_QML_EXPORT QQmlTypeWrapper : Object QVariant toVariant() const; + static void initProto(ExecutionEngine *v4); + static ReturnedValue create(ExecutionEngine *, QObject *, const QQmlType &, Heap::QQmlTypeWrapper::TypeNameMode = Heap::QQmlTypeWrapper::IncludeEnums); static ReturnedValue create(ExecutionEngine *, QObject *, const QQmlRefPointer<QQmlTypeNameCache> &, const QQmlImportRef *, @@ -95,6 +138,25 @@ protected: static PropertyAttributes virtualGetOwnProperty(const Managed *m, PropertyKey id, Property *p); static bool virtualIsEqualTo(Managed *that, Managed *o); static ReturnedValue virtualInstanceOf(const Object *typeObject, const Value &var); + +private: + static ReturnedValue method_hasInstance( + const FunctionObject *, const Value *thisObject, const Value *argv, int argc); + static ReturnedValue method_toString( + const FunctionObject *b, const Value *thisObject, const Value *, int); +}; + +struct QQmlTypeConstructor : QQmlTypeWrapper +{ + V4_OBJECT2(QQmlTypeConstructor, QQmlTypeWrapper) + + static ReturnedValue virtualCallAsConstructor( + const FunctionObject *f, const Value *argv, int argc, const Value *) + { + Q_ASSERT(f->as<QQmlTypeWrapper>()); + return QMetaObjectWrapper::construct( + static_cast<const QQmlTypeWrapper *>(f)->d(), argv, argc); + } }; struct Q_QML_EXPORT QQmlScopedEnumWrapper : Object diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h index 8815c914ce..dd23547c04 100644 --- a/src/qml/qml/qqmlvaluetype_p.h +++ b/src/qml/qml/qqmlvaluetype_p.h @@ -111,12 +111,11 @@ struct Q_QML_EXPORT QQmlPointFValueType Q_GADGET QML_VALUE_TYPE(point) QML_FOREIGN(QPointF) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlPointFValueType) QML_STRUCTURED_VALUE public: - QQmlPointFValueType() = default; + Q_INVOKABLE QQmlPointFValueType() = default; Q_INVOKABLE QQmlPointFValueType(const QPoint &point) : v(point) {} Q_INVOKABLE QString toString() const; qreal x() const; @@ -135,7 +134,6 @@ struct Q_QML_EXPORT QQmlPointValueType Q_GADGET QML_ANONYMOUS QML_FOREIGN(QPoint) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlPointValueType) QML_STRUCTURED_VALUE @@ -159,12 +157,11 @@ struct Q_QML_EXPORT QQmlSizeFValueType Q_GADGET QML_VALUE_TYPE(size) QML_FOREIGN(QSizeF) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlSizeFValueType) QML_STRUCTURED_VALUE public: - QQmlSizeFValueType() = default; + Q_INVOKABLE QQmlSizeFValueType() = default; Q_INVOKABLE QQmlSizeFValueType(const QSize &size) : v(size) {} Q_INVOKABLE QString toString() const; qreal width() const; @@ -183,7 +180,6 @@ struct Q_QML_EXPORT QQmlSizeValueType Q_GADGET QML_ANONYMOUS QML_FOREIGN(QSize) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlSizeValueType) QML_STRUCTURED_VALUE @@ -213,12 +209,11 @@ struct Q_QML_EXPORT QQmlRectFValueType Q_GADGET QML_VALUE_TYPE(rect) QML_FOREIGN(QRectF) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlRectFValueType) QML_STRUCTURED_VALUE public: - QQmlRectFValueType() = default; + Q_INVOKABLE QQmlRectFValueType() = default; Q_INVOKABLE QQmlRectFValueType(const QRect &rect) : v(rect) {} Q_INVOKABLE QString toString() const; qreal x() const; @@ -253,7 +248,6 @@ struct Q_QML_EXPORT QQmlRectValueType Q_GADGET QML_ANONYMOUS QML_FOREIGN(QRect) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlRectValueType) QML_STRUCTURED_VALUE @@ -284,7 +278,6 @@ namespace QQmlEasingEnums { Q_NAMESPACE_EXPORT(Q_QML_EXPORT) QML_NAMED_ELEMENT(Easing) -QML_ADDED_IN_VERSION(2, 0) enum Type { Linear = QEasingCurve::Linear, @@ -323,7 +316,6 @@ struct Q_QML_EXPORT QQmlEasingValueType Q_GADGET QML_ANONYMOUS QML_FOREIGN(QEasingCurve) - QML_ADDED_IN_VERSION(2, 0) QML_EXTENDED(QQmlEasingValueType) QML_STRUCTURED_VALUE diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 7075d0f5f6..a85601e5b9 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -3,41 +3,34 @@ #include "qqmlvaluetypewrapper_p.h" -#include <private/qqmlvaluetype_p.h> #include <private/qqmlbinding_p.h> -#include <private/qqmlglobal_p.h> #include <private/qqmlbuiltinfunctions_p.h> +#include <private/qqmlvaluetype_p.h> -#include <private/qv4engine_p.h> -#include <private/qv4functionobject_p.h> -#include <private/qv4variantobject_p.h> #include <private/qv4alloca_p.h> -#include <private/qv4stackframe_p.h> -#include <private/qv4objectiterator_p.h> -#include <private/qv4qobjectwrapper_p.h> -#include <private/qv4identifiertable_p.h> -#include <private/qv4lookup_p.h> -#include <private/qv4sequenceobject_p.h> #include <private/qv4arraybuffer_p.h> #include <private/qv4dateobject_p.h> +#include <private/qv4engine_p.h> +#include <private/qv4functionobject_p.h> +#include <private/qv4identifiertable_p.h> #include <private/qv4jsonobject_p.h> +#include <private/qv4lookup_p.h> +#include <private/qv4qobjectwrapper_p.h> +#include <private/qv4stackframe_p.h> +#include <private/qv4variantobject_p.h> + +#include <QtCore/qline.h> +#include <QtCore/qsize.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qloggingcategory.h> + #if QT_CONFIG(regularexpression) #include <private/qv4regexpobject_p.h> #endif -#if QT_CONFIG(qml_locale) -#include <private/qqmllocale_p.h> -#endif -#include <QtCore/qloggingcategory.h> -#include <QtCore/qdatetime.h> -#include <QtCore/QLine> -#include <QtCore/QLineF> -#include <QtCore/QSize> -#include <QtCore/QSizeF> -#include <QtCore/QTimeZone> QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcBindingRemoval) +Q_DECLARE_LOGGING_CATEGORY(lcBuiltinsBindingRemoval) DEFINE_OBJECT_VTABLE(QV4::QQmlValueTypeWrapper); @@ -304,7 +297,7 @@ static ReturnedValue getGadgetProperty(ExecutionEngine *engine, { if (isFunction) { // calling a Q_INVOKABLE function of a value type - return QV4::QObjectMethod::create(engine->rootContext(), valueTypeWrapper, coreIndex); + return QV4::QObjectMethod::create(engine, valueTypeWrapper, coreIndex); } const QMetaObject *metaObject = valueTypeWrapper->metaObject(); @@ -785,7 +778,7 @@ bool QQmlValueTypeWrapper::virtualPut(Managed *m, PropertyKey id, const Value &v QV4::Scoped<QQmlBindingFunction> bindingFunction(scope, (const Value &)f); - QV4::ScopedFunctionObject f(scope, bindingFunction->bindingFunction()); + QV4::Scoped<JavaScriptFunctionObject> f(scope, bindingFunction->bindingFunction()); QV4::ScopedContext ctx(scope, f->scope()); QQmlBinding *newBinding = QQmlBinding::create(&cacheData, f->function(), referenceObject, context, ctx); newBinding->setSourceLocation(bindingFunction->currentLocation()); @@ -796,12 +789,12 @@ bool QQmlValueTypeWrapper::virtualPut(Managed *m, PropertyKey id, const Value &v QQmlPropertyPrivate::setBinding(newBinding); return true; } else if (referenceObject) { - if (Q_UNLIKELY(lcBindingRemoval().isInfoEnabled())) { + if (Q_UNLIKELY(lcBuiltinsBindingRemoval().isInfoEnabled())) { if (auto binding = QQmlPropertyPrivate::binding(referenceObject, QQmlPropertyIndex(referencePropertyIndex, pd.coreIndex()))) { Q_ASSERT(binding->kind() == QQmlAbstractBinding::QmlBinding); const auto qmlBinding = static_cast<const QQmlBinding*>(binding); const auto stackFrame = v4->currentStackFrame; - qCInfo(lcBindingRemoval, + qCInfo(lcBuiltinsBindingRemoval, "Overwriting binding on %s::%s which was initially bound at %s by setting \"%s\" at %s:%d", referenceObject->metaObject()->className(), referenceObject->metaObject()->property(referencePropertyIndex).name(), qPrintable(qmlBinding->expressionIdentifier()), diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h index 5b3894a07f..97709dfb4c 100644 --- a/src/qml/qml/qqmlvaluetypewrapper_p.h +++ b/src/qml/qml/qqmlvaluetypewrapper_p.h @@ -19,14 +19,6 @@ #include <private/qtqmlglobal_p.h> #include <private/qv4referenceobject_p.h> -#include <private/qqmlpropertycache_p.h> -#include <private/qqmltype_p_p.h> -#include <private/qqmltypewrapper_p.h> -#include <private/qv4object_p.h> -#include <private/qv4qobjectwrapper_p.h> -#include <private/qv4sequenceobject_p.h> -#include <private/qv4value_p.h> -#include <private/qv4referenceobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 5f3b6975ca..dffddd2e0d 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -1141,7 +1141,7 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * QV4::Scope scope(v4); - QV4::ScopedFunctionObject function(scope, method(id)); + QV4::Scoped<QV4::JavaScriptFunctionObject> function(scope, method(id)); if (!function) { // The function was not compiled. There are some exceptional cases which the // expression rewriter does not rewrite properly (e.g., \r-terminated lines diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index c5d18860db..b4800584a3 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -1708,7 +1708,7 @@ DEFINE_OBJECT_VTABLE(QQmlXMLHttpRequestWrapper); void Heap::QQmlXMLHttpRequestCtor::init(ExecutionEngine *engine) { - Heap::FunctionObject::init(engine->rootContext(), QStringLiteral("XMLHttpRequest")); + Heap::FunctionObject::init(engine, QStringLiteral("XMLHttpRequest")); Scope scope(engine); Scoped<QV4::QQmlXMLHttpRequestCtor> ctor(scope, this); |