diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-13 09:02:14 +0000 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-19 12:38:45 +0000 |
| commit | ff18b02f21a04f7092b58be04be5a40df3ef993b (patch) | |
| tree | 66c268bc6bab9c38f27c682f0a3fd4093080da97 /qmake | |
| parent | 519fcb38a2b9e2c4490e8a3c740ad43227a71b77 (diff) | |
uic: Revert the microoptimization patch introducing QStringLiteral
This reverts the following commits:
d12d2949d1e4ac08a47928ef27bc45459b3fb104
26c3bec09bccf9006f5ef4945a428d9ef56c1d12
49b08f96e824f49fab9aa5c9a1a0ed582d4558bb
We can't easily predict all code paths for QDesigner
with such a microoptimization. We also don't want
to generate three different string constructions
depending on some sophisticated heuristics.
[ChangeLog][uic] The -no-stringliteral option is now deprecated and
UIC will not generate QStringLiteral anymore.
Task-number: QTBUG-65251
Task-number: QTBUG-51602
Change-Id: I34a5a1934a8df19c5c84ac2ba8e5168ce5665037
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 2b184887fe..fa5290130c 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2355,9 +2355,7 @@ This variable is used to customize the list of options passed to the \l{uic}{User Interface Compiler} in each of the build rules where it is - used. For example, \c{-no-stringliteral} can be passed to use QLatin1String - instead of QStringLiteral in generated code (which is the default for - dynamic libraries). + used. \section1 QMAKE_WATCHOS_DEPLOYMENT_TARGET |