2 files changed, 19 insertions, 6 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
index f1b1c6b90e..12190b981b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
@@ -49,14 +49,21 @@ int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
 
-    if (application.arguments().count() != 4)
-        return -1;
-
     QCoreApplication::setOrganizationName("Nokia");
     QCoreApplication::setOrganizationDomain("nokia.com");
     QCoreApplication::setApplicationName("Qml2Puppet");
     QCoreApplication::setApplicationVersion("1.0.0");
 
+    if (application.arguments().count() == 2 && application.arguments().at(1) == "--version") {
+        qDebug() << QCoreApplication::applicationVersion();
+        return 0;
+    }
+
+    if (application.arguments().count() != 4)
+        return -1;
+
+
+
 #ifdef ENABLE_QT_BREAKPAD
     QtSystemExceptionHandler systemExceptionHandler;
 #endif
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
index b558031aa5..aa9669bd6e 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
@@ -56,14 +56,20 @@ int main(int argc, char *argv[])
 
     QApplication application(argc, argv);
 
-    if (application.arguments().count() != 4)
-        return -1;
-
     QCoreApplication::setOrganizationName("Nokia");
     QCoreApplication::setOrganizationDomain("nokia.com");
     QCoreApplication::setApplicationName("QmlPuppet");
     QCoreApplication::setApplicationVersion("1.1.0");
 
+
+    if (application.arguments().count() == 2 && application.arguments().at(1) == "--version") {
+        qDebug() << QCoreApplication::applicationVersion();
+        return 0;
+    }
+
+    if (application.arguments().count() != 4)
+        return -1;
+
 #ifdef ENABLE_QT_BREAKPAD
     QtSystemExceptionHandler systemExceptionHandler;
 #endif