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

QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1

Browse Source 
Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2014-03-12 10:50:39 +01:00
parent 065253a259
commit 541b5141f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp
View File

@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
}
if (application.arguments().count() == 2 && application.arguments().at(1) == "--version") {
std::cout << 2;
std::cout << 3;
return 0;
}

2
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
View File

@@ -139,7 +139,7 @@ bool NodeInstanceServerProxy::checkPuppetVersion(const QString &qmlPuppetPath)
bool canConvert;
unsigned int versionNumber = versionString.toUInt(&canConvert);
return canConvert && versionNumber == 2;
return canConvert && versionNumber == 3;
}
NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceView, RunModus runModus, const QString &pathToQt)