--- a/src/tools/bootstrap/bootstrap.pro	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/tools/bootstrap/bootstrap.pro	Tue Jul 06 15:10:48 2010 +0300
@@ -25,7 +25,8 @@
         QT_NO_TEXTSTREAM \
         QT_NO_THREAD \
         QT_NO_UNICODETABLES \
-        QT_NO_USING_NAMESPACE
+        QT_NO_USING_NAMESPACE \
+        QT_QCHAR_CONSTRUCTOR
 win32:DEFINES += QT_NODLL
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \
@@ -95,7 +96,7 @@
    LIBS += -framework CoreServices
 }
 
-contains(QT_CONFIG, zlib) {
+contains(QT_CONFIG, zlib)|cross_compile {
    INCLUDEPATH += ../../3rdparty/zlib
    SOURCES+= \
         ../3rdparty/zlib/adler32.c \
@@ -113,3 +114,13 @@
 
 lib.CONFIG = dummy_install
 INSTALLS += lib
+
+# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working.
+sis_target.target = sis
+sis_target.commands =
+sis_target.depends = first
+QMAKE_EXTRA_TARGETS += sis_target
+freeze_target.target = freeze
+freeze_target.commands =
+freeze_target.depends = first
+QMAKE_EXTRA_TARGETS += freeze_target