Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

This changes many different CMake places to mention Qt6 instead of
Qt5.

Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.

Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4

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);