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 --- mkspecs/features/uic.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mkspecs') 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 -- cgit v1.2.3