From 541b5141f2c5a2e7babf44e71ff6f579e302a61a Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 12 Mar 2014 10:50:39 +0100 Subject: [PATCH] QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1 Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25 Reviewed-by: Marco Bubke --- share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp | 2 +- .../designercore/instances/nodeinstanceserverproxy.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp index f2eb3897307..941191ef72c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppetmain.cpp @@ -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; } diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index b1262b21fea..e5fed4356e4 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -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)