From d12d2949d1e4ac08a47928ef27bc45459b3fb104 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Mon, 31 Jul 2017 17:20:53 +0300 Subject: uic: Add -no-stringliteral option ... and use it when building shared libraries and plugins. It prevents application crashes in cases when libraries and plugins are unloaded and their strings are still used by the main application. Task-number: QTBUG-51602 Change-Id: I4af79183f18c5ed6142d55af02a36fe4334f3fee Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira Reviewed-by: Friedemann Kleint --- src/tools/uic/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/tools/uic/main.cpp') diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 3599470403..46a1e66bcc 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -75,6 +75,10 @@ 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("Use QLatin1String instead of QStringLiteral in generated code.")); + parser.addOption(noStringLiteralOption); + QCommandLineOption postfixOption(QStringLiteral("postfix")); postfixOption.setDescription(QStringLiteral("Postfix to add to all generated classnames.")); postfixOption.setValueName(QStringLiteral("postfix")); @@ -107,6 +111,7 @@ int runUic(int argc, char *argv[]) driver.option().outputFile = parser.value(outputOption); driver.option().headerProtection = !parser.isSet(noProtOption); driver.option().implicitIncludes = !parser.isSet(noImplicitIncludesOption); + driver.option().stringLiteral = !parser.isSet(noStringLiteralOption); driver.option().idBased = parser.isSet(idBasedOption); driver.option().postfix = parser.value(postfixOption); driver.option().translateFunction = parser.value(translateOption); -- cgit v1.2.1