Merge commit 'qt-mainline/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

1 files changed, 1 insertions, 11 deletions

diff --git a/configure b/configure
index b3da5b0..e148b6d 100755
--- a/configure
+++ b/configure
@@ -2244,16 +2244,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src"
 fi
 
-# symlink files from src/gui/embedded neccessary to build qvfb
-if [ "$CFG_DEV" = "yes" ]; then
-    mkdir -p "$outpath/tools/qvfb"
-    for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do
-	dest="${outpath}/tools/qvfb/${f}"
-	rm -f "$dest"
-	ln -s "${relpath}/src/gui/embedded/${f}" "${dest}"
-    done
-fi
-
 # symlink fonts to be able to run application from build directory
 if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then
     if [ "$PLATFORM" = "$XPLATFORM" ]; then
@@ -6404,7 +6394,7 @@ else
 fi
 
 if [ "$CFG_SCRIPT" = "auto" ]; then
-    CFG_SCRIPT="$canBuildWebKit"
+    CFG_SCRIPT="yes"
 fi
 
 if [ "$CFG_SCRIPT" = "yes" ]; then