diff options
Diffstat (limited to 'util')
-rw-r--r-- | util/qlalr/cppgenerator.cpp | 53 | ||||
-rwxr-xr-x | util/scripts/make_qfeatures_dot_h | 44 | ||||
-rwxr-xr-x | util/webkit/mkdist-webkit | 4 |
3 files changed, 80 insertions, 21 deletions
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 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 0644564..2e6334d 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -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" @@ -104,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" @@ -132,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" |