diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-07-31 17:20:53 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-08-03 09:59:15 +0000 |
commit | d12d2949d1e4ac08a47928ef27bc45459b3fb104 (patch) | |
tree | 1b5ce8a66074aadcc0c756bee1952bbc4359768a /src/tools/uic/utils.h | |
parent | 8ba373361d79402be877cbd5d6dd8ec7de7d0e27 (diff) |
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 <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/uic/utils.h')
-rw-r--r-- | src/tools/uic/utils.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h index 7c5918cab9..18b361fb81 100644 --- a/src/tools/uic/utils.h +++ b/src/tools/uic/utils.h @@ -107,19 +107,6 @@ inline QString fixString(const QString &str, const QString &indent, return rc; } -inline QString writeString(const QString &s, const QString &indent) -{ - unsigned flags = 0; - const QString ret = fixString(s, indent, &flags); - if (flags & Utf8String) - return QLatin1String("QString::fromUtf8(") + ret + QLatin1Char(')'); - // MSVC cannot concat L"foo" "bar" (C2308: concatenating mismatched strings), - // use QLatin1String instead (all platforms to avoid cross-compiling issues). - if (flags & MultiLineString) - return QLatin1String("QLatin1String(") + ret + QLatin1Char(')'); - return QLatin1String("QStringLiteral(") + ret + QLatin1Char(')'); -} - inline QHash<QString, DomProperty *> propertyMap(const QList<DomProperty *> &properties) { QHash<QString, DomProperty *> map; |