diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-16 17:20:33 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 20:53:22 +0200 |
commit | 048b697c0723db563ab20d82b615c55fd16f79c5 (patch) | |
tree | 83ef962636a7efd372ed54085bc5bff73212015c /mkspecs/features | |
parent | a0280e5cac5b4f268c20e89a1c2d0364c323a7cf (diff) |
There's no uic3 anymore
Change-Id: Iacbe2e6a802278c2c82ae60551eae5bc2636e6f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r-- | mkspecs/features/uic.prf | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 9cb0773b8d..a98c62676c 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,4 +1,3 @@ -qtPrepareTool(QMAKE_UIC3, uic3) qtPrepareTool(QMAKE_UIC, uic) isEmpty(UI_DIR):UI_DIR = . @@ -32,78 +31,3 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR } - -uic3 { - isEmpty(FORMS3) { - UIC3_FORMS = FORMS - !build_pass:message("Project contains CONFIG+=uic3, but no files in FORMS3; UI files in FORMS treated as UIC3 form files.") - } else { - UIC3_FORMS = FORMS3 - } - - uic3_decl.commands = $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic3_decl.dependency_type = TYPE_UI - uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_decl.input = $$UIC3_FORMS - uic3_decl.CONFIG += no_link - uic3_decl.variable_out = GENERATED_FILES UIC3_HEADERS - uic3_decl.name = UIC3 Decl ${QMAKE_FILE_IN} - silent:uic3_decl.commands = @echo uic3 ${QMAKE_FILE_IN} && $$uic3_decl.commands - QMAKE_EXTRA_COMPILERS += uic3_decl - - uic3_impl.commands = $$QMAKE_UIC3 -impl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic3_impl.dependency_type = TYPE_UI - uic3_impl.output = $$UI_SOURCES_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} - uic3_impl.depends = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_impl.input = $$UIC3_FORMS - uic3_impl.variable_out = GENERATED_SOURCES - uic3_impl.name = UIC3 Impl ${QMAKE_FILE_IN} - silent:uic3_impl.commands = @echo uic3 -impl ${QMAKE_FILE_IN} && $$uic3_impl.commands - QMAKE_EXTRA_COMPILERS += uic3_impl - - ### add a moc step - load(moc) - uic3_moc.commands = $$moc_header.commands - uic3_moc.output = $$moc_header.output - uic3_moc.depends = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_moc.input = UIC3_HEADERS - uic3_moc.variable_out = GENERATED_SOURCES - uic3_moc.name = $$moc_header.name - !contains(TEMPLATE, "vc.*"):!isEmpty(INCLUDETEMP):uic3_moc.depends += $$INCLUDETEMP - QMAKE_EXTRA_COMPILERS += uic3_moc -} - -defineReplace(imageCollectionCmd) { - unset(EMBEDDED_IMAGES) - RET = - for(image, $$list($$split(1))) { - EMBEDDED_IMAGES += $$image - count(EMBEDDED_IMAGES, 5) { - isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > $${UI_DIR}/images.tmp $$escape_expand(\\n\\t) - else: RET += echo $$EMBEDDED_IMAGES >> $${UI_DIR}/images.tmp $$escape_expand(\\n\\t) - unset(EMBEDDED_IMAGES) - } - } - !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> $${UI_DIR}/images.tmp $$escape_expand(\\n\\t) - !isEmpty(RET) { - RET += $$QMAKE_UIC3 -embed $$TARGET -f $${UI_DIR}/images.tmp -o $$2 $$escape_expand(\\n\\t) - return($$RET) - } - return($$QMAKE_UIC3 -embed $$TARGET $$1 -o $$2) -} - -image_collection.output = $${UI_DIR}/qmake_image_collection$${first(QMAKE_EXT_CPP)} -image_collection.variable_out = SOURCES -image_collection.input = IMAGES -image_collection.CONFIG += combine -image_collection.name = UIC3 Image collection in ${QMAKE_FILE_OUT} -!win32 { - image_collection.commands = $$QMAKE_UIC3 -embed $$TARGET ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - silent:image_collection.commands = @echo uic3 -embed ${QMAKE_FILE_IN} && $$image_collection.commands -} else { - image_collection.commands = ${QMAKE_FUNC_imageCollectionCmd} - silent:image_collection.commands = @echo uic3 -embed $$TARGET -f $${UI_DIR}/images.tmp && $image_collection.commands -} -QMAKE_EXTRA_COMPILERS += image_collection - - |