diff options
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 10 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 14 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativescript.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/v8/qv8typewrapper.cpp | 2 |
4 files changed, 10 insertions, 18 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 4198e8cf7b..79094b7e0e 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -476,7 +476,7 @@ void QDeclarativeCompiler::genLiteralAssignment(QDeclarativeScript::Property *pr instr.setType(QDeclarativeInstruction::StoreTime); instr.storeTime.propertyIndex = prop->index; Q_ASSERT(sizeof(instr.storeTime.time) == sizeof(QTime)); - ::memcpy(&instr.storeTime.time, &time, sizeof(QTime)); } + ::memcpy(&instr.storeTime.time, &time, sizeof(QTime)); } break; case QVariant::DateTime: @@ -3033,8 +3033,14 @@ bool QDeclarativeCompiler::compileAlias(QFastMetaBuilder &builder, prop.resolvedCustomTypeName = pool->NewByteArray(typeName); prop.typeRef = builder.newString(typeName.length()); + int propertyFlags = 0; + if (writable) + propertyFlags |= QFastMetaBuilder::Writable; + if (resettable) + propertyFlags |= QFastMetaBuilder::Resettable; + builder.setProperty(propIndex, prop.nameRef, prop.typeRef, (QMetaType::Type)type, - (QFastMetaBuilder::PropertyFlag)(writable?int(QFastMetaBuilder::Writable):0), + (QFastMetaBuilder::PropertyFlag)propertyFlags, propIndex); return true; diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 3bf04b35d4..5947a9a684 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -968,20 +968,6 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data) return -1; } -bool QDeclarativeMetaType::isAnyModule(const QByteArray &module) -{ - QDeclarativeMetaTypeData *data = metaTypeData(); - - QDeclarativeMetaTypeData::ModuleInfoHash::Iterator it = data->modules.begin(); - while (it != data->modules.end()) { - if (it.key().first == module) - return true; - ++it; - } - - return false; -} - /* Returns true if a module \a uri of any version is installed. */ diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp index e83e4026d8..55a6b2b2cf 100644 --- a/src/declarative/qml/qdeclarativescript.cpp +++ b/src/declarative/qml/qdeclarativescript.cpp @@ -970,7 +970,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node) index++; } - signal.location = location(node->typeToken, node->semicolonToken); + signal->location = location(node->typeToken, node->semicolonToken); _stateStack.top().object->dynamicSignals.append(signal); } else { const QStringRef &memberType = node->memberType; diff --git a/src/declarative/qml/v8/qv8typewrapper.cpp b/src/declarative/qml/v8/qv8typewrapper.cpp index 6bd9a54db5..dc99cbbcb6 100644 --- a/src/declarative/qml/v8/qv8typewrapper.cpp +++ b/src/declarative/qml/v8/qv8typewrapper.cpp @@ -228,7 +228,7 @@ v8::Handle<v8::Value> QV8TypeWrapper::Setter(v8::Local<v8::String> property, v8engine->qobjectWrapper()->setProperty(ao, propertystring, value, QV8QObjectWrapper::IgnoreRevision); } else if (resource->typeNamespace) { - if (QDeclarativeMetaType::ModuleApiInstance *moduleApi = resource->typeNamespace->moduleApi()) { + if (QDeclarativeMetaType::ModuleApiInstance *moduleApi = resource->typeNamespace->moduleApi(resource->importNamespace)) { if (moduleApi->scriptCallback) { moduleApi->scriptApi = moduleApi->scriptCallback(v8engine->engine(), v8engine->engine()); moduleApi->scriptCallback = 0; |