diff -r dd9efe7d5452 -r 236b41bfb628 qt/qt.spec
--- a/qt/qt.spec	Sat Oct 16 12:53:55 2010 +0200
+++ b/qt/qt.spec	Sat Oct 16 17:18:32 2010 +0200
@@ -28,9 +28,6 @@
 #   FIXME: MSvB: The effects of these bugs are platform dependent.
 #   FIXME: MSvB: Solaris 11 IA-32 builds fail while Linux 2.6.25.18
 #   FIXME: MSvB: AMD64 builds succeed.
-#   FIXME: MSvB:
-#   FIXME: MSvB: -no-webkit added to broken static buildconf
-#   FIXME: MSvB: as work around for 'ld: cannot find -ljscore'
 
 #   package information
 Name:         qt
@@ -43,7 +40,7 @@
 Group:        Development
 License:      GPL
 Version:      4.7.0
-Release:      20101014
+Release:      20101015
 
 #   build options
 %option       with_tools     yes
@@ -215,9 +212,11 @@
     %{l_shtool} subst \
         -e 's;\(CONFIG[\t ]*+=[\t ]*qt\);\1 x11;' \
         tools/qtconfig/qtconfig.pro
-    #%{l_shtool} subst \
-    #    -e "s;\(\\title\) All Classes;\1 Qt's Classes;" \
-    #    doc/src/classes.qdoc
+    %{l_shtool} subst \
+        -e 's;webkit;web-broken-kit;g' \
+        tools/assistant/tools/assistant/assistant.pro
+    echo "DEFINES += QT_NO_WEBKIT" \
+        >>tools/assistant/tools/assistant/assistant.pro
     %{l_shtool} subst \
         -e "s;Qt.s Classes;All Classes;" \
         tools/assistant/tools/assistant/doc/assistant.qdoc \
@@ -397,7 +396,7 @@
         -openssl-linked \
         -xmlpatterns \
         -svg \
-        -no-webkit \
+        -webkit \
         -system-zlib \
         -qt-gif \
         -system-libpng \