Merge commit 'origin/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

2 files changed, 24 insertions, 13 deletions

diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index 2c919aa..bdd68a3 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -49,8 +49,14 @@
 # will show them.
 #
 
-open FL, "$ENV{QTDIR}/src/corelib/global/qfeatures.txt"
-    or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.txt";
+if ($ENV{QTSRCDIR} ne '') {
+    $qtbase=$ENV{QTSRCDIR};
+} else {
+    $qtbase=$ENV{QTDIR};
+}
+
+open FL, "$qtbase/src/corelib/global/qfeatures.txt"
+    or die "Cannot open $qtbase/src/corelib/global/qfeatures.txt";
 
 while (<FL>) {
     if ( /^Feature: (\S*)/ ) {
@@ -120,19 +126,19 @@ for $macro ( @macros ) {
     }
 }
 
-open OUT, ">$ENV{QTDIR}/src/corelib/global/qfeatures.h"
-    or die "Cannot open $ENV{QTDIR}/src/corelib/global/qfeatures.h for writing";
+open OUT, ">$qtbase/src/corelib/global/qfeatures.h"
+    or die "Cannot open $qtbase/src/corelib/global/qfeatures.h for writing";
 
 print OUT
 '/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info\@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
-** \$QT_BEGIN_LICENSE:LGPL\$
+** $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
@@ -147,13 +153,12 @@ print OUT
 ** 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.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info\@nokia.com.
+** Nokia at qt-info@nokia.com.
 **
 **
 **
@@ -162,7 +167,7 @@ print OUT
 **
 **
 **
-** \$QT_END_LICENSE\$
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit
index b5c0460..49d4785 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -5,7 +5,7 @@ die() {
     exit 1
 }
 
-default_tag="qtwebkit-4.6-snapshot-29072009"
+default_tag="qtwebkit-4.6-snapshot-18092009"
 
 if [ $# -eq 0 ]; then
     tag="$default_tag"
@@ -42,6 +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/wtf/wx"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/gtk"
 excluded_directories="$excluded_directories JavaScriptCore/wtf/mac"
@@ -76,6 +77,7 @@ excluded_directories="$excluded_directories WebCore/page/mac"
 excluded_directories="$excluded_directories WebCore/page/wx"
 excluded_directories="$excluded_directories WebCore/page/chromium"
 excluded_directories="$excluded_directories WebCore/page/haiku"
+excluded_directories="$excluded_directories WebCore/page/wince"
 
 excluded_directories="$excluded_directories WebCore/history/mac"
 
@@ -196,6 +198,10 @@ 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"
 
+files_to_remove="$files_to_remove WebCore/wscript"
+files_to_remove="$files_to_remove WebCore/WebCore.ContextMenus.exp"
+files_to_remove="$files_to_remove WebCore/WebCore.DragSupport.exp"
+files_to_remove="$files_to_remove WebCore/WebCore.Inspector.exp"
 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"