diff options
author | Marco Bubke <marco.bubke@nokia.com> | 2011-07-27 20:13:39 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-07-28 10:14:53 +0200 |
commit | 754b993c3606baea4f219788c5125873835f3fd8 (patch) | |
tree | 7bfbe2c4feb3397d4d172c903577156d75b970d6 /share/qtcreator/qml/qmlpuppet | |
parent | 776f19025e9f6fe6c0b0460476382735fbdae363 (diff) | |
download | qt-creator-754b993c3606baea4f219788c5125873835f3fd8.tar.gz |
QmlDesigner.NodeInstances: Add version to puppet
Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp | 13 | ||||
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp | 12 |
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 |