diff -r 93b982ccede2 -r 5daf16870df6 mkspecs/features/uic.prf --- a/mkspecs/features/uic.prf Mon Jun 21 22:38:13 2010 +0100 +++ b/mkspecs/features/uic.prf Thu Jul 22 16:41:55 2010 +0100 @@ -1,13 +1,6 @@ - -isEmpty(QMAKE_UIC3) { - contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe - else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3 -} - -isEmpty(QMAKE_UIC) { - contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe - else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -} +defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf +qtPrepareTool(QMAKE_UIC3, uic3) +qtPrepareTool(QMAKE_UIC, uic) isEmpty(UI_DIR):UI_DIR = . isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR