feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: QT_NO_CAST_FROM_ASCII fixes

Browse Source 
Change-Id: Ife1552a666bbb1b3333e1fa46854d95de252f2aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-08 11:47:46 +02:00
committed by Thomas Hartmann
parent a1c1d7d26f
commit 10bbc00873
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -1570,7 +1570,7 @@ void ModelPrivate::changeRootNodeType(const TypeName &type, int majorVersion, in
rootNode()->setType(type); rootNode()->setType(type);
rootNode()->setMajorVersion(majorVersion); rootNode()->setMajorVersion(majorVersion);
rootNode()->setMinorVersion(minorVersion); rootNode()->setMinorVersion(minorVersion);
notifyRootNodeTypeChanged(type, majorVersion, minorVersion); notifyRootNodeTypeChanged(QString::fromLatin1(type), majorVersion, minorVersion);
} }
void ModelPrivate::setScriptFunctions(const InternalNode::Pointer &internalNodePointer, const QStringList &scriptFunctionList) 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; return true;
if (!allowHigherVersion) if (!allowHigherVersion)
return false; return false;
QStringList version1List = version1.split('.'); QStringList version1List = version1.split(QLatin1Char('.'));
QStringList version2List = version2.split('.'); QStringList version2List = version2.split(QLatin1Char('.'));
if (version1List.count() == 2 && version2List.count() == 2) { if (version1List.count() == 2 && version2List.count() == 2) {
bool ok; bool ok;
int major1 = version1List.first().toInt(&ok); int major1 = version1List.first().toInt(&ok);