uic: Remove deprecated options

The --no-stringliteral option got introduced by commit d12d294 for 5.10.0, but already deprecated in commit ff18b02 for 5.12.0. [ChangeLog][uic] uic does not accept the --no-stringliteral/-s option anymore. Change-Id: I7a0f647ad91b3760bc826884702bf8581f5565f2 Reviewed-by: Jarek Kobus <[email protected]>
dougcooper · May 27, 2019 · 5505d25 · 5505d25
1 parent 1dde5a7
commit 5505d25
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
@@ -76,10 +76,6 @@ int runUic(int argc, char *argv[])
     noImplicitIncludesOption.setDescription(QStringLiteral("Disable generation of #include-directives."));
     parser.addOption(noImplicitIncludesOption);
 
-    QCommandLineOption noStringLiteralOption(QStringList() << QStringLiteral("s") << QStringLiteral("no-stringliteral"));
-    noStringLiteralOption.setDescription(QStringLiteral("Deprecated. The use of this option won't take any effect."));
-    parser.addOption(noStringLiteralOption);
-
     QCommandLineOption postfixOption(QStringLiteral("postfix"));
     postfixOption.setDescription(QStringLiteral("Postfix to add to all generated classnames."));
     postfixOption.setValueName(QStringLiteral("postfix"));
@@ -124,9 +120,6 @@ int runUic(int argc, char *argv[])
     }
     language::setLanguage(language);
 
-    if (parser.isSet(noStringLiteralOption))
-        fprintf(stderr, "The -s, --no-stringliteral option is deprecated and it won't take any effect.\n");
-
     QString inputFile;
     if (!parser.positionalArguments().isEmpty())
         inputFile = parser.positionalArguments().at(0);