diff options
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 4 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 4adb268fb4..7846081a4a 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -197,7 +197,7 @@ void QQmlPropertyData::load(const QMetaMethod &m) if (m.parameterCount()) { flags |= HasArguments; if ((m.parameterCount() == 1) && (m.parameterTypes().first() == "QQmlV4Function*")) { - flags |= IsV8Function; + flags |= IsV4Function; } } @@ -228,7 +228,7 @@ void QQmlPropertyData::lazyLoad(const QMetaMethod &m) if (m.parameterCount()) { flags |= HasArguments; if ((m.parameterCount() == 1) && (m.parameterTypes().first() == "QQmlV4Function*")) { - flags |= IsV8Function; + flags |= IsV4Function; } } diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 15bd83fcb3..b7e0a525b7 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -113,7 +113,7 @@ public: HasArguments = 0x00080000, // Function takes arguments IsSignal = 0x00100000, // Function is a signal IsVMESignal = 0x00200000, // Signal was added by QML - IsV8Function = 0x00400000, // Function takes QQmlV8Function* args + IsV4Function = 0x00400000, // Function takes QQmlV4Function* args IsSignalHandler = 0x00800000, // Function is a signal handler IsOverload = 0x01000000, // Function is an overload of another function IsCloned = 0x02000000, // The function was marked as cloned @@ -154,7 +154,7 @@ public: bool hasArguments() const { return flags & HasArguments; } bool isSignal() const { return flags & IsSignal; } bool isVMESignal() const { return flags & IsVMESignal; } - bool isV8Function() const { return flags & IsV8Function; } + bool isV4Function() const { return flags & IsV4Function; } bool isSignalHandler() const { return flags & IsSignalHandler; } bool isOverload() const { return flags & IsOverload; } bool isCloned() const { return flags & IsCloned; } diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index c4e0b0d0e7..1ef33d5461 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -550,7 +550,7 @@ v8::Handle<v8::Value> QV8QObjectWrapper::GetProperty(QV8Engine *engine, QObject QQmlVMEMetaObject *vmemo = QQmlVMEMetaObject::get(object); Q_ASSERT(vmemo); return vmemo->vmeMethod(result->coreIndex); - } else if (result->isV8Function()) { + } else if (result->isV4Function()) { return MethodClosure::createWithGlobal(engine, object, objectHandle, result->coreIndex); } else if (result->isSignalHandler()) { v8::Handle<v8::Object> handler = engine->qobjectWrapper()->m_signalHandlerConstructor.value().asFunctionObject()->newInstance(); @@ -2017,7 +2017,7 @@ QV4::Value QV8QObjectWrapper::Invoke(const v8::Arguments &args) return QV4::Value::undefinedValue(); } - if (method.isV8Function()) { + if (method.isV4Function()) { QV4::Value rv = QV4::Value::undefinedValue(); v8::Handle<v8::Value> qmlglobal = args[2]; |