1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index 279d6565da..489724ac47 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -362,8 +362,10 @@ bool QCommandLineParser::addOption(const QCommandLineOption &option)
 
     if (!optionNames.isEmpty()) {
         for (const QString &name : optionNames) {
-            if (d->nameHash.contains(name))
+            if (d->nameHash.contains(name)) {
+                qWarning() << "QCommandLineParser: already having an option named" << name;
                 return false;
+            }
         }
 
         d->commandLineOptionList.append(option);
@@ -589,7 +591,7 @@ static void showParserMessage(const QString &message, MessageType type)
 void QCommandLineParser::process(const QStringList &arguments)
 {
     if (!d->parse(arguments)) {
-        showParserMessage(errorText() + QLatin1Char('\n'), ErrorMessage);
+        showParserMessage(QCoreApplication::applicationName() + QLatin1String(": ") + errorText() + QLatin1Char('\n'), ErrorMessage);
         qt_call_post_routines();
         ::exit(EXIT_FAILURE);
     }