diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-05-17 14:30:10 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-05-27 09:56:38 +0000 |
commit | 5505d25be972948db1621e1511b89b4144aa8bfc (patch) | |
tree | 1d503c975b8683dfb00b8959fccdd91aad24bf04 /src/tools | |
parent | 1dde5a7b9523ab7f62a6965edfd7b87ed40eecb8 (diff) |
uic: Remove deprecated options
The --no-stringliteral option got introduced by commit d12d2949d1e4ac0
for 5.10.0, but already deprecated in commit ff18b02f21a04f7 for 5.12.0.
[ChangeLog][uic] uic does not accept the --no-stringliteral/-s option
anymore.
Change-Id: I7a0f647ad91b3760bc826884702bf8581f5565f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/uic/main.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 166fe78ff7..e689d477bd 100644 --- 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); |