diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 15:38:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-07 19:54:32 +0100 |
| commit | 5a0ac34396fa73dc7c91399ff106097f690d8971 (patch) | |
| tree | 6773c0dface9cf697f48ab26765c5215f424ab56 | |
| parent | d6fd4e52f10148e399131c73b90d91523bdad0da (diff) | |
finish the job of removing uic3 support
this should have been in 048b697c07.
Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | mkspecs/features/uic.prf | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index a98c62676c..679132f116 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,33 +1,22 @@ qtPrepareTool(QMAKE_UIC, uic) isEmpty(UI_DIR):UI_DIR = . -isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR -isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ -# Allow FORMS3 to contain old UIC3 forms, while FORMS contains new -# UIC files in the same project. However, if CONFIG+=uic3 and no -# FORMS3 is defined, FORMS may only contain old UIC3 files. +uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} +uic.depend_command = "$$QMAKE_UIC" -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 +uic.name = UIC ${QMAKE_FILE_IN} +silent:uic.commands = @echo uic ${QMAKE_FILE_IN} && $$uic.commands +QMAKE_EXTRA_COMPILERS += uic +INCREDIBUILD_XGE += uic -!uic3|!isEmpty(FORMS3) { - # If we have CONFIG+=uic3 and no FORMS3, then don't do this step, - # as UIC3 files don't need a ui_<formname>.h file - - uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic.depend_command = "$$QMAKE_UIC" -d "${QMAKE_FILE_IN}" - uic.output = $$UI_HEADERS_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 - uic.name = UIC ${QMAKE_FILE_IN} - silent:uic.commands = @echo uic ${QMAKE_FILE_IN} && $$uic.commands - QMAKE_EXTRA_COMPILERS += uic - INCREDIBUILD_XGE += uic -} - -!isEmpty(FORMS)|!isEmpty(FORMS3) { - ui_dir_short = $$UI_HEADERS_DIR +!isEmpty(FORMS) { + ui_dir_short = $$UI_DIR contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/, - contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR - else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR + contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_DIR + else:INCLUDEPATH += $$OUT_PWD/$$UI_DIR } |