Merge remote-tracking branch 'origin/3.6'

Change-Id: Ic4d3d94feaaa588c6244509bb3dd14c5cb646fe7

src/tools/clangbackend/clangbackendmain.cpp

@@ -23,6 +23,7 @@
 **
 ****************************************************************************/
 
+#include <QCommandLineParser>
 #include <QCoreApplication>
 #include <QLoggingCategory>
 
@@ -30,6 +31,22 @@
 #include <cmbmessages.h>
 #include <clangipcserver.h>
 
+QString processArguments(QCoreApplication &application)
+{
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QStringLiteral("Qt Creator Clang backend process."));
+    parser.addHelpOption();
+    parser.addVersionOption();
+    parser.addPositionalArgument(QStringLiteral("connection"), QStringLiteral("Connection"));
+
+    parser.process(application);
+
+    if (parser.positionalArguments().isEmpty())
+        parser.showHelp(1);
+
+    return parser.positionalArguments().first();
+}
+
 int main(int argc, char *argv[])
 {
     QLoggingCategory::setFilterRules(QStringLiteral("*.debug=false"));
@@ -41,10 +58,7 @@ int main(int argc, char *argv[])
 
     QCoreApplication application(argc, argv);
 
-    if (application.arguments().count() != 2) {
-        qWarning() << "wrong argument count";
-        return 1;
-    }
+    const QString connection =  processArguments(application);
 
     ClangBackEnd::Messages::registerMessages();
 
@@ -52,7 +66,7 @@ int main(int argc, char *argv[])
     clang_enableStackTraces();
 
     ClangBackEnd::ClangIpcServer clangIpcServer;
-    ClangBackEnd::ConnectionServer connectionServer(application.arguments()[1]);
+    ClangBackEnd::ConnectionServer connectionServer(connection);
     connectionServer.start();
     connectionServer.setIpcServer(&clangIpcServer);