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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/uic.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index ca8283920a..134d3b4acb 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -3,8 +3,10 @@ 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_FILE_IN} -o ${QMAKE_FILE_OUT} +uic.commands = $$QMAKE_UIC $$QMAKE_UIC_FLAGS ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} uic.depend_command = $$QMAKE_UIC_DEP -d ${QMAKE_FILE_IN} uic.output = $$UI_DIR/$${QMAKE_MOD_UIC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} uic.input = FORMS |