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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/uic.prf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 134d3b4acb..5579e05125 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -3,8 +3,6 @@ qtPrepareTool(QMAKE_UIC, uic, _DEP) isEmpty(UI_DIR):UI_DIR = . isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ -contains(TEMPLATE, .*lib):dll: QMAKE_UIC_FLAGS += -no-stringliteral - uic.depends += $$QMAKE_UIC_EXE uic.commands = $$QMAKE_UIC $$QMAKE_UIC_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} uic.depend_command = $$QMAKE_UIC_DEP -d ${QMAKE_FILE_IN} |