Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	mkspecs/features/qt.prf

10 files changed, 204 insertions, 10 deletions

diff --git a/util/qlalr/compress.h b/util/qlalr/compress.h
index 5619afc..bf779cc 100644
--- a/util/qlalr/compress.h
+++ b/util/qlalr/compress.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 335e13b..459c35e 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/cppgenerator.h b/util/qlalr/cppgenerator.h
index 8aa7147..98f3a8c 100644
--- a/util/qlalr/cppgenerator.h
+++ b/util/qlalr/cppgenerator.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/dotgraph.h b/util/qlalr/dotgraph.h
index df4d216..9a71769 100644
--- a/util/qlalr/dotgraph.h
+++ b/util/qlalr/dotgraph.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/grammar_p.h b/util/qlalr/grammar_p.h
index 3f0c0d0..1794fe5 100644
--- a/util/qlalr/grammar_p.h
+++ b/util/qlalr/grammar_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/lalr.h b/util/qlalr/lalr.h
index 7d7c692..1dd843f 100644
--- a/util/qlalr/lalr.h
+++ b/util/qlalr/lalr.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/parsetable.h b/util/qlalr/parsetable.h
index f2cd264..6d5490a 100644
--- a/util/qlalr/parsetable.h
+++ b/util/qlalr/parsetable.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/qlalr/recognizer.h b/util/qlalr/recognizer.h
index fdc6448..667517e 100644
--- a/util/qlalr/recognizer.h
+++ b/util/qlalr/recognizer.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QLALR project on Qt Labs.
+** This file is part of the utils of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/util/webkit/mkdist-javascriptcore b/util/webkit/mkdist-javascriptcore
new file mode 100755
index 0000000..dc33f6c
--- /dev/null
+++ b/util/webkit/mkdist-javascriptcore
@@ -0,0 +1,187 @@
+#!/bin/bash
+
+die() {
+    echo $*
+    exit 1
+}
+
+default_tag="javascriptcore-4.6-snapshot-29072009"
+
+if [ $# -eq 0 ]; then
+    tag="$default_tag"
+elif [ $# -eq 1 ]; then
+    tag=$1
+else
+    die "usage: $0 [commit (defaults to $default_tag)]"
+fi
+
+repository=`git config qtwebkit.url`
+if [ -z "$repository" ]; then
+    die "error: cannot locate webkit git repository. please run git config --global qtwebkit.url /path-or-url/to/webkit/repo"
+fi
+
+excluded_directories="$excluded_directories JavaScriptCore/Makefile"
+excluded_directories="$excluded_directories JavaScriptCore/GNUmakefile.am"
+excluded_directories="$excluded_directories JavaScriptCore/Configurations"
+excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.exp"
+excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.xcodeproj"
+excluded_directories="$excluded_directories JavaScriptCore/tests"
+excluded_directories="$excluded_directories JavaScriptCore/API/tests"
+excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.vcproj"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/wx"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/mac"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/win"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium"
+excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku"
+excluded_directories="$excluded_directories JavaScriptCore/icu"
+
+
+files_to_remove=""
+files_to_remove="$files_to_remove JavaScriptCore/AllInOneFile.cpp"
+files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl"
+files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl"
+
+require_clean_work_tree() {
+    # test if working tree is dirty
+    git rev-parse --verify HEAD > /dev/null &&
+    git update-index --refresh &&
+    git diff-files --quiet &&
+    git diff-index --cached --quiet HEAD ||
+    die "Working tree is dirty"
+}
+
+which qmake >/dev/null 2>/dev/null
+if [ "$?" != 0 ]; then
+    die "abort: Could not locate qmake in your PATH"
+fi
+
+test -z "$(git rev-parse --show-cdup)" || {
+       exit=$?
+       echo >&2 "You need to run this command from the toplevel of the working tree."
+       exit $exit
+}
+
+echo "checking working tree"
+require_clean_work_tree
+
+revCount=`git ls-remote $repository | grep $tag | awk '{print $1}' | wc -l`
+if [ "$revCount" != 1 ]; then
+    die "Cannot parse $tag into a revision. It seems ambiguous".
+fi
+
+rev=`git ls-remote $repository | grep -E "^.+$tag$" | awk '{print $1}'`
+
+tarball=`mktemp /tmp/webkit-snapshot.tar.XXXXXX` || exit 1
+echo "creating $tarball"
+
+echo "archiving webkit from $repository $tag ( $rev )"
+
+git archive --remote=$repository $rev JavaScriptCore WebKit.pri > $tarball || exit 1
+
+echo "removing unwanted files and directories"
+for dir in $excluded_directories; do
+    echo "    removing $dir"
+    tar --delete --file=$tarball $dir
+done
+
+for item in $exclude_with_exceptions_list; do
+    dir=`echo $item | awk -F : '{print $1}'`
+    include=`echo $item | awk -F : '{print $2}'`
+    echo "    removing $dir except $include"
+    files=`tar --list --file=$tarball $dir | grep -v -E "^$dir\$" | grep -v $include`
+    tar --delete --file=$tarball $files
+done
+
+for file in $files_to_remove; do
+    echo "    removing $file"
+    tar --delete --file=$tarball $file
+done
+
+echo "done!"
+
+srcdir=src/3rdparty/javascriptcore
+absSrcDir=$PWD/$srcdir
+localDiff=
+lastImportRevison=
+
+echo "replacing $srcdir"
+if [  -d $srcdir ]; then
+    git ls-files $srcdir | xargs rm
+    git ls-files -z src/3rdparty/javascriptcore | git update-index --force-remove -z --stdin
+else
+    mkdir -p $srcdir
+fi
+
+(cd $srcdir && tar xf $tarball)
+git add $srcdir
+
+echo "generating extra sources"
+(
+  for proj in JavaScriptCore; do
+      cd $absSrcDir/$proj &&
+      rm -rf tmp &&
+      mkdir tmp &&
+      cd tmp &&
+      mkdir -p ../generated &&
+      qmake -o Makefile CONFIG-=QTDIR_build QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated  OUTPUT_DIR=`pwd` ../$proj.pro &&
+      make generated_files &&
+      perl -pi -e "s,$absSrcDir/,,g" ../generated/*.cpp ../generated/*.h &&
+      git add ../generated &&
+      cd .. &&
+      rm -rf tmp &&
+      cd ..
+  done
+)
+rm -rf $srcdir/WebKitBuild
+
+cat >$srcdir/VERSION <<EOT
+This is a snapshot of JavaScriptCore from
+
+        git://gitorious.org/qtwebkit/qtwebkit.git
+
+The commit imported was from the
+
+        $tag branch/tag
+
+and has the sha1 checksum
+
+        $rev
+EOT
+git add $srcdir/VERSION
+
+git diff-files --name-only -z | git update-index --remove -z --stdin
+
+echo "removing $tarball"
+rm -f $tarball
+
+cat >commitlog.txt <<EOT
+Updated JavaScriptCore from $repository to $tag ( $rev )
+EOT
+
+if [ -d "$repository/.git" -a -n "$lastImportRevison" ]; then
+    echo >>commitlog.txt
+    echo "Changes in WebKit/qt since the last update:" >>commitlog.txt
+    echo >>commitlog.txt
+    git --git-dir=$repository/.git diff $lastImportRevison $rev -- WebKit/qt/ChangeLog | sed -n -e "s,^\+\(.*\),\1,p" >>commitlog.txt
+fi
+
+echo "Changes:"
+echo
+git --no-pager diff --name-status --cached $srcdir
+
+echo
+echo "Wrote commitlog.txt. Use with"
+echo
+echo "    git commit -e -F commitlog.txt"
+echo
+echo "to commit your changes"
+
+if [ -n "$localDiff" ]; then
+    echo
+    echo "The changes that were locally stored in Perforce are now stored as a git patch in $localDiff"
+    echo "You may want to appy them with"
+    echo
+    echo "    git am -3 $localDiff"
+    echo
+fi
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit
index 49d4785..74a4f65 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -5,7 +5,7 @@ die() {
     exit 1
 }
 
-default_tag="qtwebkit-4.6-snapshot-18092009"
+default_tag="qtwebkit-4.6-snapshot-24092009"
 
 if [ $# -eq 0 ]; then
     tag="$default_tag"
@@ -42,7 +42,7 @@ excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.xcodep
 excluded_directories="$excluded_directories JavaScriptCore/tests"
 excluded_directories="$excluded_directories JavaScriptCore/API/tests"
 excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.vcproj"
-excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.pro"
+excluded_directories="$excluded_directories JavaScriptCore/JavaScriptCore.gyp"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/wx"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/mac"
@@ -51,9 +51,12 @@ excluded_directories="$excluded_directories JavaScriptCore/wtf/chromium"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/haiku"
 
 excluded_directories="$excluded_directories WebCore/WebCore.vcproj"
+excluded_directories="$excluded_directories WebCore/WebCore.gyp"
 excluded_directories="$excluded_directories WebCore/DerivedSources.make"
 excluded_directories="$excluded_directories WebCore/GNUmakefile.am"
 excluded_directories="$excluded_directories WebCore/WebCore.base.exp"
+excluded_directories="$excluded_directories WebCore/WebCore.PluginHostProcess.exp"
+excluded_directories="$excluded_directories WebCore/WebCore.OrientationEvents.exp"
 excluded_directories="$excluded_directories WebCore/WebCore.xcodeproj"
 excluded_directories="$excluded_directories WebCore/Configurations"
 
@@ -145,6 +148,7 @@ excluded_directories="$excluded_directories WebKit/win"
 excluded_directories="$excluded_directories WebKit/wx"
 excluded_directories="$excluded_directories WebKit/cf"
 excluded_directories="$excluded_directories WebKit/haiku"
+excluded_directories="$excluded_directories WebKit/chromium"
 
 excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj"
 excluded_directories="$excluded_directories WebCore/English.lproj"
@@ -194,6 +198,9 @@ files_to_remove="$files_to_remove WebKit.pro"
 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/QtLauncher.pro"
 files_to_remove="$files_to_remove WebKit/qt/QtLauncher/main.cpp"
 
+files_to_remove="$files_to_remove WebKit/qt/QGVLauncher/QGVLauncher.pro"
+files_to_remove="$files_to_remove WebKit/qt/QGVLauncher/main.cpp"
+
 files_to_remove="$files_to_remove JavaScriptCore/AllInOneFile.cpp"
 files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl"
 files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl"