summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-06-25 13:49:53 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-06-25 13:49:53 (GMT)
commitdb8f05e257019694f5e8076845626008f2adc3dd (patch)
tree05d3959403cf15ac5f702091439e028af01f343b /util
parent8aafaa65a1d16f8b982279f5aceedf1e281ddb5a (diff)
parent796a5a2c7d8c91a46ac761dde18b7da2ec6c177b (diff)
downloadQt-db8f05e257019694f5e8076845626008f2adc3dd.zip
Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.gz
Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.bz2
Merge commit 'qt/master-stable' into 4.6-stable
Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
Diffstat (limited to 'util')
-rwxr-xr-xutil/local_database/qlocalexml2cpp.py18
-rw-r--r--util/normalize/main.cpp22
-rw-r--r--util/qlalr/cppgenerator.cpp53
-rwxr-xr-xutil/scripts/make_qfeatures_dot_h7
-rwxr-xr-xutil/webkit/mkdist-webkit21
5 files changed, 78 insertions, 43 deletions
diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py
index a9abe22..d625cfd 100755
--- a/util/local_database/qlocalexml2cpp.py
+++ b/util/local_database/qlocalexml2cpp.py
@@ -237,7 +237,17 @@ class StringData:
return self.hash[s]
lst = map(lambda x: hex(ord(x)), s)
- token = StringDataToken(len(self.data), len(lst))
+ index = len(self.data)
+ if index >= 65535:
+ print "\n\n\n#error Data index is too big!"
+ sys.stderr.write ("\n\n\nERROR: index exceeds the uint16 range! index = %d\n" % index)
+ sys.exit(1)
+ size = len(lst)
+ if size >= 65535:
+ print "\n\n\n#error Data is too big!"
+ sys.stderr.write ("\n\n\nERROR: data size exceeds the uint16 range! size = %d\n" % size)
+ sys.exit(1)
+ token = StringDataToken(index, size)
self.hash[s] = token
self.data += lst
return token
@@ -308,7 +318,7 @@ def main():
print
# Locale index
- print "static const uint locale_index[] = {"
+ print "static const quint16 locale_index[] = {"
print " 0, // unused"
index = 0
for key in language_map.keys():
@@ -444,7 +454,7 @@ def main():
print
# Language name index
- print "static const uint language_name_index[] = {"
+ print "static const quint16 language_name_index[] = {"
print " 0, // Unused"
index = 8
for key in language_map.keys():
@@ -467,7 +477,7 @@ def main():
print
# Country name index
- print "static const uint country_name_index[] = {"
+ print "static const quint16 country_name_index[] = {"
print " 0, // AnyCountry"
index = 8
for key in country_map.keys():
diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp
index 905c1ec..b16335e 100644
--- a/util/normalize/main.cpp
+++ b/util/normalize/main.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
#include <qcoreapplication.h>
-#include <qdir.h>
+#include <qdiriterator.h>
#include <qfile.h>
#include <qmetaobject.h>
#include <qstring.h>
@@ -140,18 +140,14 @@ void check(const QString &fileName)
void traverse(const QString &path)
{
- QDir dir(path);
- dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoSymLinks);
-
- const QFileInfoList list = dir.entryInfoList();
- for (int i = 0; i < list.count(); ++i) {
- const QFileInfo fi = list.at(i);
- if (fi.fileName() == QLatin1String(".") || fi.fileName() == QLatin1String(".."))
- continue;
- if (fi.fileName().endsWith(".cpp"))
- check(path + fi.fileName());
- if (fi.isDir())
- traverse(path + fi.fileName() + "/"); // recurse
+ QDirIterator dirIterator(path, QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks);
+
+ while (dirIterator.hasNext()) {
+ QString filePath = dirIterator.next();
+ if (filePath.endsWith(".cpp"))
+ check(filePath);
+ else if (QFileInfo(filePath).isDir())
+ traverse(filePath); // recurse
}
}
diff --git a/util/qlalr/cppgenerator.cpp b/util/qlalr/cppgenerator.cpp
index 9bfc1a9..e85aa4c 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/util/qlalr/cppgenerator.cpp
@@ -49,18 +49,47 @@
QString CppGenerator::trollCopyrightHeader() const
{
return QLatin1String(
- "/****************************************************************************\n"
- "**\n"
- "** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
- "**\n"
- "** This file is part of the $MODULE$ of the Qt Toolkit.\n"
- "**\n"
- "** $TROLLTECH_DUAL_LICENSE$\n"
- "**\n"
- "** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE\n"
- "** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.\n"
- "**\n"
- "****************************************************************************/\n"
+
+"/****************************************************************************\n"
+"**\n"
+"** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+"** Contact: Qt Software Information (qt-info@nokia.com)\n"
+"**\n"
+"** This file is part of the QtCore module of the Qt Toolkit.\n"
+"**\n"
+"** $QT_BEGIN_LICENSE:LGPL$\n"
+"** No Commercial Usage\n"
+"** This file contains pre-release code and may not be distributed.\n"
+"** You may use this file in accordance with the terms and conditions\n"
+"** contained in the either Technology Preview License Agreement or the\n"
+"** Beta Release License Agreement.\n"
+"**\n"
+"** GNU Lesser General Public License Usage\n"
+"** Alternatively, this file may be used under the terms of the GNU Lesser\n"
+"** General Public License version 2.1 as published by the Free Software\n"
+"** Foundation and appearing in the file LICENSE.LGPL included in the\n"
+"** packaging of this file. Please review the following information to\n"
+"** ensure the GNU Lesser General Public License version 2.1 requirements\n"
+"** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n"
+"**\n"
+"** In addition, as a special exception, Nokia gives you certain\n"
+"** additional rights. These rights are described in the Nokia Qt LGPL\n"
+"** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this\n"
+"** package.\n"
+"**\n"
+"** GNU General Public License Usage\n"
+"** Alternatively, this file may be used under the terms of the GNU\n"
+"** General Public License version 3.0 as published by the Free Software\n"
+"** Foundation and appearing in the file LICENSE.GPL included in the\n"
+"** packaging of this file. Please review the following information to\n"
+"** ensure the GNU General Public License version 3.0 requirements will be\n"
+"** met: http://www.gnu.org/copyleft/gpl.html.\n"
+"**\n"
+"** If you are unsure which license is appropriate for your use, please\n"
+"** contact the sales department at qt-sales@nokia.com.\n"
+"** $QT_END_LICENSE$\n"
+"**\n"
+"****************************************************************************/\n"
"\n");
}
diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h
index 5ca8c88..27f43e9 100755
--- a/util/scripts/make_qfeatures_dot_h
+++ b/util/scripts/make_qfeatures_dot_h
@@ -83,7 +83,7 @@ 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) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info\@nokia.com)
@@ -127,10 +127,11 @@ print OUT
/*
* 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 c26fdc1..730e8eb 100755
--- a/util/webkit/mkdist-webkit
+++ b/util/webkit/mkdist-webkit
@@ -5,7 +5,7 @@ die() {
exit 1
}
-default_tag="origin/qtwebkit-4.5"
+default_tag="origin/svn/master"
if [ $# -eq 0 ]; then
tag="$default_tag"
@@ -27,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"
@@ -46,6 +46,7 @@ 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 WebCore/WebCore.vcproj"
excluded_directories="$excluded_directories WebCore/DerivedSources.make"
@@ -57,6 +58,7 @@ excluded_directories="$excluded_directories WebCore/Configurations"
excluded_directories="$excluded_directories WebCore/bridge/objc"
excluded_directories="$excluded_directories WebCore/bridge/testbindings.pro"
excluded_directories="$excluded_directories WebCore/bindings/objc"
+excluded_directories="$excluded_directories WebCore/bindings/v8"
excluded_directories="$excluded_directories JavaScriptCore/icu"
@@ -70,6 +72,7 @@ excluded_directories="$excluded_directories WebCore/loader/win"
excluded_directories="$excluded_directories WebCore/page/gtk"
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/history/mac"
@@ -78,6 +81,7 @@ excluded_directories="$excluded_directories WebCore/editing/wx"
excluded_directories="$excluded_directories WebCore/platform/text/wx"
excluded_directories="$excluded_directories WebCore/platform/text/gtk"
+excluded_directories="$excluded_directories WebCore/platform/text/chromium"
excluded_directories="$excluded_directories WebCore/manual-tests"
@@ -87,6 +91,7 @@ excluded_directories="$excluded_directories WebCore/platform/network/curl"
excluded_directories="$excluded_directories WebCore/platform/network/mac"
excluded_directories="$excluded_directories WebCore/platform/network/win"
excluded_directories="$excluded_directories WebCore/platform/network/soup"
+excluded_directories="$excluded_directories WebCore/platform/network/chromium"
excluded_directories="$excluded_directories WebCore/platform/graphics/cg"
excluded_directories="$excluded_directories WebCore/platform/graphics/cairo"
@@ -95,6 +100,7 @@ excluded_directories="$excluded_directories WebCore/platform/graphics/wx"
excluded_directories="$excluded_directories WebCore/platform/graphics/mac"
excluded_directories="$excluded_directories WebCore/platform/graphics/win"
excluded_directories="$excluded_directories WebCore/platform/graphics/skia"
+excluded_directories="$excluded_directories WebCore/platform/graphics/chromium"
excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp"
excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif"
@@ -103,9 +109,10 @@ excluded_directories="$excluded_directories WebCore/platform/image-decoders/png"
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/platform/image-decoders/skia"
-excluded_directories="$excluded_directories WebCore/plugins/wx"
excluded_directories="$excluded_directories WebCore/plugins/gtk"
+excluded_directories="$excluded_directories WebCore/plugins/chromium"
excluded_directories="$excluded_directories WebCore/platform/symbian WebCore/platform/wx"
excluded_directories="$excluded_directories WebKit/gtk"
@@ -114,11 +121,6 @@ excluded_directories="$excluded_directories WebKit/mac"
excluded_directories="$excluded_directories WebKit/wx"
excluded_directories="$excluded_directories WebKit/cf"
-excluded_directories="$excluded_directories WebCore/svg/graphics/cg"
-excluded_directories="$excluded_directories WebCore/svg/graphics/cairo"
-excluded_directories="$excluded_directories WebCore/svg/graphics/filters/cg"
-excluded_directories="$excluded_directories WebCore/svg/graphics/mac"
-
excluded_directories="$excluded_directories WebKit/English.lproj WebKit/WebKit.xcodeproj"
excluded_directories="$excluded_directories WebCore/English.lproj"
@@ -132,7 +134,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"
@@ -144,13 +145,11 @@ 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 JavaScriptCore/AllInOneFile.cpp"
-files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCore.scons"
files_to_remove="$files_to_remove JavaScriptCore/JavaScriptCoreSources.bkl"
files_to_remove="$files_to_remove JavaScriptCore/SConstruct"
files_to_remove="$files_to_remove JavaScriptCore/jscore.bkl"
files_to_remove="$files_to_remove WebCore/SConstruct"
-files_to_remove="$files_to_remove WebCore/WebCore.scons"
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"