--- a/tests/auto/bic/gen.sh	Fri May 14 16:40:13 2010 +0300
+++ b/tests/auto/bic/gen.sh	Thu May 27 13:40:48 2010 +0300
@@ -49,7 +49,7 @@
 fi
 
 if [ "$1" = "-all" ]; then
-    modules="QtCore QtGui QtSql QtSvg QtNetwork QtScript QtXml QtXmlPatterns QtOpenGL Qt3Support QtTest QtDBus QtDesigner QtXmlPatterns"
+    modules="QtCore QtGui Qt3Support QtDBus QtDesigner QtHelp QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns phonon"
 else
     modules="$1"
 fi
@@ -59,8 +59,10 @@
     g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
     mv test.cpp*.class $module.$2.txt
     # Remove template classes from the output
-    perl -pi -e '$skip = 0 if (/^\n/);
-        $skip = 1 if (/^(Class|Vtable).*</);
-        $_ = "" if ($skip);' $module.$2.txt
+    perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</);
+        if ($skip) {
+            $skip = 0 if (/^$/);
+            $_ = "";
+        }' $module.$2.txt
 done