qmllint: Remove deprecated options

We kept these around for compatibility in Qt 6.2 but now it's time to get rid off them

[ChangeLog][QtQuick][qmllint] The deprecated --no-[category] options from Qt 6.1 are now fully removed, use the new style of options as outlined in --help.

Change-Id: Ie564a8262fdefa2685fe86b59b46dc3aa25d4958
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 0 insertions, 35 deletions

diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp
index 178af18c1a..97a383eb86 100644
--- a/tools/qmllint/main.cpp
+++ b/tools/qmllint/main.cpp
@@ -251,19 +251,6 @@ All warnings can be set to three levels:
                            it.value().levelToString());
     }
 
-    // TODO: Remove after Qt 6.2
-    QCommandLineOption disableCheckUnqualified(QStringList() << "no-unqualified-id");
-    disableCheckUnqualified.setFlags(QCommandLineOption::HiddenFromHelp);
-    parser.addOption(disableCheckUnqualified);
-
-    QCommandLineOption disableCheckWithStatement(QStringList() << "no-with-statement");
-    disableCheckWithStatement.setFlags(QCommandLineOption::HiddenFromHelp);
-    parser.addOption(disableCheckWithStatement);
-
-    QCommandLineOption disableCheckInheritanceCycle(QStringList() << "no-inheritance-cycle");
-    disableCheckInheritanceCycle.setFlags(QCommandLineOption::HiddenFromHelp);
-    parser.addOption(disableCheckInheritanceCycle);
-
     QCommandLineOption resourceOption(
                 { QStringLiteral("resource") },
                 QStringLiteral("Look for related files in the given resource file"),
@@ -337,28 +324,6 @@ All warnings can be set to three levels:
     bool silent = parser.isSet(silentOption);
     bool useJson = parser.isSet(jsonOption);
 
-    // TODO: Remove after Qt 6.2
-    bool NoWarnUnqualified = parser.isSet(disableCheckUnqualified);
-    bool NoWarnWithStatement = parser.isSet(disableCheckWithStatement);
-    bool NoWarnInheritanceCycle = parser.isSet(disableCheckInheritanceCycle);
-
-    if (NoWarnUnqualified) {
-        options[QStringLiteral("unqualified")].m_disabled = true;
-        qWarning()
-                << "Warning: --no-unqualified-id is deprecated. Use --unqualified disable instead.";
-    }
-
-    if (NoWarnWithStatement) {
-        options[QStringLiteral("with")].m_disabled = true;
-        qWarning() << "Warning: --no-with-statement is deprecated. Use --with disable instead.";
-    }
-
-    if (NoWarnInheritanceCycle) {
-        options[QStringLiteral("inheritance-cycle")].m_disabled = true;
-        qWarning() << "Warning: --no-inheritance-cycle is deprecated. Use --inheritance-cycle "
-                      "disable instead.";
-    }
-
     // use host qml import path as a sane default if not explicitly disabled
     QStringList qmlImportPaths = parser.isSet(qmlImportNoDefault)
             ? QStringList {}