diff -r 93b982ccede2 -r 5daf16870df6 mkspecs/features/qt_functions.prf
--- a/mkspecs/features/qt_functions.prf	Mon Jun 21 22:38:13 2010 +0100
+++ b/mkspecs/features/qt_functions.prf	Thu Jul 22 16:41:55 2010 +0100
@@ -78,3 +78,14 @@
     export(QMAKE_LFLAGS)
     return(true)
 }
+
+# variable, default
+defineTest(qtPrepareTool) {
+    isEmpty($$1) {
+        !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2
+        else:$$1 = $$[QT_INSTALL_BINS]/$$2
+    }
+    $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP,
+    contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.exe$):$$1 = $$eval($$1).exe
+    export($$1)
+}