Support --option in addition to -option for all builtin Qt commandline options.

In addition to being more common and consistent with QCommandLineParser, this
will make it possible to add the documentation for these options
in the QCommandLineParser-generated help output.

[ChangeLog][General] Builtin command-line options such as -reverse,
-session, -style etc. now all support double dash, e.g. --reverse,
--session, --style...

Change-Id: Ia2e22c854ccc6a9d7b863b1234317005bc822191
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index ecbf28bab9..1803282071 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -145,18 +145,15 @@ QXcbIntegration::QXcbIntegration(const QStringList &parameters, int &argc, char
     if (argc) {
         int j = 1;
         for (int i = 1; i < argc; i++) {
-            char *arg = argv[i];
-            if (arg) {
-                if (!strcmp(arg, "-display") && i < argc - 1) {
-                    displayName = argv[++i];
-                    arg = 0;
-                } else if (!strcmp(arg, "-name") && i < argc - 1) {
-                    m_instanceName = argv[++i];
-                    arg = 0;
-                }
-            }
-            if (arg)
-                argv[j++] = arg;
+            QByteArray arg(argv[i]);
+            if (arg.startsWith("--"))
+                arg.remove(0, 1);
+            if (arg == "-display" && i < argc - 1)
+                displayName = argv[++i];
+            else if (arg == "-name" && i < argc - 1)
+                m_instanceName = argv[++i];
+            else
+                argv[j++] = argv[i];
         }
         argc = j;
     } // argc