diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:51:47 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:51:48 +0100 |
commit | 9eac4b1faf54c0b4761b7726d67d3e6abd8974f1 (patch) | |
tree | 12fb413e674230c33bc5265545965994e3f9cf76 /mkspecs/features | |
parent | 28b138cbc21c4bed7b18b70bb98a690d000ad2f9 (diff) | |
parent | f0b93f7a4b4281c5470280eb36b7c0ef5948a921 (diff) |
Merge remote-tracking branch 'origin/5.12.6' into 5.12
Change-Id: Idcbf469ddcd6824f97a56c5e3a2e5fcc1d9706cf
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/uic.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 1cedce5ae7..a5df0c7e8d 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -9,7 +9,7 @@ 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 uic.variable_out = GENERATED_FILES -uic.CONFIG += no_link target_predeps dep_lines +uic.CONFIG += no_link target_predeps dep_lines dep_existing_only uic.name = UIC ${QMAKE_FILE_IN} silent:uic.commands = @echo uic ${QMAKE_FILE_IN} && $$uic.commands QMAKE_EXTRA_COMPILERS += uic |