From a448f2b61ae6e5dd7afd395f1b4e77018ccf1496 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 28 Apr 2011 12:19:16 +0200
Subject: [PATCH] QmlDump: Update for changes in qtquick2.

---
 share/qtcreator/qml/qmldump/main.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp
index 1324396ce07..9ceab71f43b 100644
--- a/share/qtcreator/qml/qmldump/main.cpp
+++ b/share/qtcreator/qml/qmldump/main.cpp
@@ -399,7 +399,7 @@ enum ExitCode {
 
 #ifdef Q_OS_UNIX
 void sigSegvHandler(int) {
-    fprintf(stderr, "Error: qmldump SEGV\n");
+    fprintf(stderr, "Error: SEGV\n");
     if (!currentProperty.isEmpty())
         fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData());
     exit(EXIT_SEGV);
@@ -409,9 +409,9 @@ void sigSegvHandler(int) {
 void printUsage(const QString &appName)
 {
     qWarning() << qPrintable(QString(
-                                 "Usage: %1 [--notrelocatable] module.uri version [module/import/path]\n"
-                                 "       %1 --path path/to/qmldir/directory [version]\n"
-                                 "       %1 --builtins\n"
+                                 "Usage: %1 [-notrelocatable] module.uri version [module/import/path]\n"
+                                 "       %1 -path path/to/qmldir/directory [version]\n"
+                                 "       %1 -builtins\n"
                                  "Example: %1 Qt.labs.particles 4.7 /home/user/dev/qt-install/imports").arg(
                                  appName));
 }
@@ -437,7 +437,10 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
     const QStringList args = app.arguments();
     const QString appName = QFileInfo(app.applicationFilePath()).baseName();
-    if (!(args.size() >= 3 || (args.size() == 2 && args.at(1) == QLatin1String("--builtins")))) {
+    if (!(args.size() >= 3
+          || (args.size() == 2
+              && (args.at(1) == QLatin1String("--builtins")
+                  || args.at(1) == QLatin1String("-builtins"))))) {
         printUsage(appName);
         return EXIT_INVALIDARGUMENTS;
     }
@@ -450,14 +453,16 @@ int main(int argc, char *argv[])
     if (args.size() >= 3) {
         QStringList positionalArgs;
         foreach (const QString &arg, args) {
-            if (!arg.startsWith("--")) {
+            if (!arg.startsWith(QLatin1Char('-'))) {
                 positionalArgs.append(arg);
                 continue;
             }
 
-            if (arg == QLatin1String("--notrelocatable")) {
+            if (arg == QLatin1String("--notrelocatable")
+                    || arg == QLatin1String("-notrelocatable")) {
                 relocatable = false;
-            } else if (arg == QLatin1String("--path")) {
+            } else if (arg == QLatin1String("--path")
+                       || arg == QLatin1String("-path")) {
                 pathImport = true;
             } else {
                 qWarning() << "Invalid argument: " << arg;