2 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index 6817d731438..489724ac47b 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);
diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
index 7980f1f8f40..811e9a00108 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
@@ -44,6 +44,7 @@ private slots:
 
     // In-process tests
     void testInvalidOptions();
+    void testDuplicateOption();
     void testPositionalArguments();
     void testBooleanOption_data();
     void testBooleanOption();
@@ -104,6 +105,15 @@ void tst_QCommandLineParser::testInvalidOptions()
     QVERIFY(!parser.addOption(QCommandLineOption(QStringLiteral("-v"), QStringLiteral("Displays version information."))));
 }
 
+void tst_QCommandLineParser::testDuplicateOption()
+{
+    QCoreApplication app(empty_argc, empty_argv);
+    QCommandLineParser parser;
+    QVERIFY(parser.addOption(QCommandLineOption(QStringLiteral("h"), QStringLiteral("Hostname."), QStringLiteral("hostname"))));
+    QTest::ignoreMessage(QtWarningMsg, "QCommandLineParser: already having an option named \"h\"");
+    parser.addHelpOption();
+}
+
 void tst_QCommandLineParser::testPositionalArguments()
 {
     QCoreApplication app(empty_argc, empty_argv);