diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
index c572e08..345e908 100644
--- a/src/corelib/codecs/codecs.pri
+++ b/src/corelib/codecs/codecs.pri
@@ -19,7 +19,7 @@ SOURCES += \
 	codecs/qutfcodec.cpp \
 	codecs/qtextcodecplugin.cpp
 
-unix {
+
 	SOURCES += codecs/qfontlaocodec.cpp
 
         contains(QT_CONFIG,iconv) {
@@ -51,5 +51,5 @@ unix {
                         ../plugins/codecs/tw/qbig5codec.cpp \
                         ../plugins/codecs/jp/qfontjpcodec.cpp
         }
-}
+
 symbian:LIBS += -lcharconv
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 6f5aa11..1cb2912 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -951,7 +951,7 @@ Q_GLOBAL_STATIC(WinClassNameHash, winclassNames)
 //
 const QString qt_reg_winclass(QWidget *w)        // register window class
 {
-    int flags = w ? w->windowFlags() : 0;
+    int flags = w ? (int)(w->windowFlags()) : 0;
     int type = flags & Qt::WindowType_Mask;
 
     uint style;
diff --git a/tools/tools.pro b/tools/tools.pro
index f254230..f1036b7 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -4,29 +4,28 @@ TEMPLATE        = subdirs
     no-png {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {
-        symbian {
-            SUBDIRS = designer
-        } else:wince* {
-            SUBDIRS = qtestlib designer
-        } else {
-            SUBDIRS = assistant \
-                      pixeltool \
-                      porting \
-                      qtestlib \
-                      qttracereplay
-            contains(QT_EDITION, Console) {
+#        symbian {
+#            SUBDIRS = designer
+#        } else:wince* {
+#            SUBDIRS = qtestlib designer
+#        } else {
+#            SUBDIRS = pixeltool \
+#                      porting \
+#                      qtestlib \
+#                      qttracereplay
+#            contains(QT_EDITION, Console) {
                 SUBDIRS += designer/src/uitools     # Linguist depends on this
-            } else {
-                SUBDIRS += designer
-            }
-        }
-        unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-        win32:!wince*:SUBDIRS += activeqt
+#            } else {
+#                SUBDIRS += designer
+#            }
+#        }
+#        unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+#        win32:!wince*:SUBDIRS += activeqt
     }
     contains(QT_CONFIG, declarative):SUBDIRS += qml
 }
 
-!wince*:!symbian:SUBDIRS += linguist
+#!wince*:!symbian:SUBDIRS += linguist
 
 mac {
     SUBDIRS += macdeployqt
@@ -36,10 +35,10 @@ embedded:SUBDIRS += kmap2qmap
 
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 # We don't need these command line utilities on embedded platforms.
-!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
-embedded: SUBDIRS += makeqpf
+#!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
+#embedded: SUBDIRS += makeqpf
 
-!wince*:!cross_compile:SUBDIRS += qdoc3
+#!wince*:!cross_compile:SUBDIRS += qdoc3
 
 CONFIG+=ordered
 QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"