From 10bbc008734f1fede69e422d5522ec9aa993e647 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 8 Jul 2015 11:47:46 +0200 Subject: [PATCH] QmlDesigner: QT_NO_CAST_FROM_ASCII fixes Change-Id: Ife1552a666bbb1b3333e1fa46854d95de252f2aa Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/model/model.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index b917bbbbcdf..7acabb974c6 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -1570,7 +1570,7 @@ void ModelPrivate::changeRootNodeType(const TypeName &type, int majorVersion, in rootNode()->setType(type); rootNode()->setMajorVersion(majorVersion); rootNode()->setMinorVersion(minorVersion); - notifyRootNodeTypeChanged(type, majorVersion, minorVersion); + notifyRootNodeTypeChanged(QString::fromLatin1(type), majorVersion, minorVersion); } void ModelPrivate::setScriptFunctions(const InternalNode::Pointer &internalNodePointer, const QStringList &scriptFunctionList) @@ -1773,8 +1773,8 @@ static bool compareVersions(const QString &version1, const QString &version2, bo return true; if (!allowHigherVersion) return false; - QStringList version1List = version1.split('.'); - QStringList version2List = version2.split('.'); + QStringList version1List = version1.split(QLatin1Char('.')); + QStringList version2List = version2.split(QLatin1Char('.')); if (version1List.count() == 2 && version2List.count() == 2) { bool ok; int major1 = version1List.first().toInt(&ok);