diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2016-03-24 11:12:52 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@theqtcompany.com> | 2016-03-24 11:21:24 +0000 |
| commit | 706fc6c00d5d168f63b8ff3f6ae3f5284486b250 (patch) | |
| tree | aec884cfd9f276f99780e15909835e7a7c282488 /src/plugins | |
| parent | c860fe2e6e95227e04261bb83da6b99a9ae84822 (diff) | |
| download | qt-creator-706fc6c00d5d168f63b8ff3f6ae3f5284486b250.tar.gz | |
QmlDesigner: Qt 5.5 Linux build fix
Change-Id: I50bc07df07010eda4c4e3fdc49798eb73fe9650f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index 46746d5596..6c6b9198aa 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -602,7 +602,7 @@ static void addSignal(const QString &typeName, const QString &itemId, const QStr signalHandlerName = itemId.toUtf8() + ".on" + toUpper(signalName).toUtf8(); foreach (const ModelNode &modelNode, rewriterView.allModelNodes()) { - if (modelNode.type() == typeName) { + if (modelNode.type() == typeName.toUtf8()) { modelNode.signalHandlerProperty(signalHandlerName).setSource(QLatin1String("{\n}")); } } diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 8dbbfedc5c..e2b3565e5e 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1009,7 +1009,7 @@ bool NodeMetaInfoPrivate::cleverCheckType(const TypeName &otherType) const if (convertedName.isEmpty()) convertedName = qmlObjectValue->className(); - return typeName == convertedName; + return typeName == convertedName.toUtf8(); } QVariant::Type NodeMetaInfoPrivate::variantTypeId(const PropertyName &properyName) const |