Merge branch 'master' into contiguouscache

2 files changed, 59 insertions, 26 deletions

diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index c434649..056c113 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -83,23 +83,55 @@ open OUT, ">$ENV{QTDIR}/src/corelib/global/qfeatures.h"
     or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.h for writing";
 
 print OUT
-"/****************************************************************************
+'/****************************************************************************
 **
-** Copyright (C) 1992-\$THISYEAR\$ \$TROLLTECH\$. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
 **
-** This file is part of the \$MODULE\$ of the Qt Toolkit.
+** This file is part of the QtCore module of the Qt Toolkit.
 **
-** \$TROLLTECH_DUAL_LICENSE\$
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 /*
  * All features and their dependencies.
  *
- * This list is generated from \$QTDIR/src/corelib/global/qfeatures.txt
+ * This list is generated from $QTDIR/src/corelib/global/qfeatures.txt
  */
 
-";
+';
+
 
 for $macro ( @macros ) {
     print OUT "// $label{$macro}\n";
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit
index 1268b5e..701133e 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -1,7 +1,24 @@
 #!/bin/bash
 
-repository="git://git.dev.troll.no/webkit-mirror"
-tag="qtwebkit-merged-into-qt-4-4"
+die() {
+    echo $*
+    exit 1
+}
+
+default_tag="origin/svn/master"
+
+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="LayoutTests JavaScriptGlue WebKitLibraries WebKitSite WebKitTools WebCore/platform/cf WebCore/platform/gtk WebCore/platform/chromium"
 excluded_directories="$excluded_directories PageLoadTests"
@@ -10,7 +27,7 @@ excluded_directories="$excluded_directories PlanetWebKit"
 excluded_directories="$excluded_directories SunSpider"
 excluded_directories="$excluded_directories WebKitExamplePlugins"
 
-excluded_directories="$excluded_directories symbols.filter"
+excluded_directories="$excluded_directories autotools"
 excluded_directories="$excluded_directories JavaScriptCore/Makefile"
 excluded_directories="$excluded_directories Makefile"
 excluded_directories="$excluded_directories Makefile.shared"
@@ -87,7 +104,6 @@ excluded_directories="$excluded_directories WebCore/platform/image-decoders/ico"
 excluded_directories="$excluded_directories WebCore/platform/image-decoders/jpeg"
 excluded_directories="$excluded_directories WebCore/platform/image-decoders/xbm"
 
-excluded_directories="$excluded_directories WebCore/plugins/wx"
 excluded_directories="$excluded_directories WebCore/plugins/gtk"
 
 excluded_directories="$excluded_directories WebCore/platform/symbian WebCore/platform/wx"
@@ -115,7 +131,6 @@ files_to_remove="$files_to_remove WebKit/qt/Api/qcookiejar.h"
 files_to_remove="$files_to_remove WebKit/qt/Api/qcookiejar.cpp"
 
 files_to_remove="$files_to_remove WebCore/rendering/RenderThemeMac.mm"
-files_to_remove="$files_to_remove acinclude.m4"
 files_to_remove="$files_to_remove autogen.sh"
 files_to_remove="$files_to_remove configure.ac"
 
@@ -138,20 +153,6 @@ files_to_remove="$files_to_remove WebCore/WebCoreSources.bkl"
 files_to_remove="$files_to_remove WebCore/webcore-base.bkl"
 files_to_remove="$files_to_remove WebCore/webcore-wx.bkl"
 
-if [ $# -eq 1 ]; then
-    tag=$1
-fi
-
-if [ $# -eq 2 ]; then
-    repository=$1
-    tag=$2
-fi
-
-die() {
-    echo $*
-    exit 1
-}
-
 require_clean_work_tree() {
     # test if working tree is dirty
     git rev-parse --verify HEAD > /dev/null &&
@@ -251,7 +252,7 @@ echo "generating extra sources"
       mkdir tmp &&
       cd tmp &&
       mkdir -p ../generated &&
-      qmake -o Makefile QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated  OUTPUT_DIR=`pwd` ../$proj.pro &&
+      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 &&