diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 14:10:20 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 14:10:20 +0200 |
| commit | d4a4b01f2f08a9031d692344d0d264de472da25e (patch) | |
| tree | d7cf58d0971630c62eb87a7aed17917b23f53e4b /util | |
| parent | b36b2605961afef44c78c47b06feb64bedbd3563 (diff) | |
| parent | 058520de736230b6867210c3f7c12d976c15adde (diff) | |
| download | qt4-tools-d4a4b01f2f08a9031d692344d0d264de472da25e.tar.gz | |
Merge branch '4.5' into 4.6
Conflicts:
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/qtdbus.qdoc
src/gui/accessible/qaccessible_mac_cocoa.mm
src/gui/kernel/qapplication_win.cpp
src/xmlpatterns/parser/createTokenLookup.sh
tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui
tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui
tests/auto/linguist/lupdate/testdata/good/parseui/project.ui
tests/auto/runQtXmlPatternsTests.sh
tests/auto/test.pl
tests/auto/uic/baseline/batchtranslation.ui
tests/auto/uic/baseline/batchtranslation.ui.h
tests/auto/uic/baseline/config.ui
tests/auto/uic/baseline/config.ui.h
tests/auto/uic/baseline/finddialog.ui
tests/auto/uic/baseline/finddialog.ui.h
tests/auto/uic/baseline/formwindowsettings.ui
tests/auto/uic/baseline/formwindowsettings.ui.h
tests/auto/uic/baseline/helpdialog.ui
tests/auto/uic/baseline/helpdialog.ui.h
tests/auto/uic/baseline/listwidgeteditor.ui
tests/auto/uic/baseline/listwidgeteditor.ui.h
tests/auto/uic/baseline/mainwindowbase.ui
tests/auto/uic/baseline/mainwindowbase.ui.h
tests/auto/uic/baseline/newactiondialog.ui
tests/auto/uic/baseline/newactiondialog.ui.h
tests/auto/uic/baseline/newform.ui
tests/auto/uic/baseline/newform.ui.h
tests/auto/uic/baseline/orderdialog.ui
tests/auto/uic/baseline/orderdialog.ui.h
tests/auto/uic/baseline/paletteeditor.ui
tests/auto/uic/baseline/paletteeditor.ui.h
tests/auto/uic/baseline/paletteeditoradvancedbase.ui
tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
tests/auto/uic/baseline/phrasebookbox.ui
tests/auto/uic/baseline/phrasebookbox.ui.h
tests/auto/uic/baseline/plugindialog.ui
tests/auto/uic/baseline/plugindialog.ui.h
tests/auto/uic/baseline/previewwidget.ui
tests/auto/uic/baseline/previewwidget.ui.h
tests/auto/uic/baseline/previewwidgetbase.ui
tests/auto/uic/baseline/previewwidgetbase.ui.h
tests/auto/uic/baseline/qfiledialog.ui
tests/auto/uic/baseline/qfiledialog.ui.h
tests/auto/uic/baseline/qtgradientdialog.ui
tests/auto/uic/baseline/qtgradientdialog.ui.h
tests/auto/uic/baseline/qtgradientviewdialog.ui
tests/auto/uic/baseline/qtgradientviewdialog.ui.h
tests/auto/uic/baseline/saveformastemplate.ui
tests/auto/uic/baseline/saveformastemplate.ui.h
tests/auto/uic/baseline/statistics.ui
tests/auto/uic/baseline/statistics.ui.h
tests/auto/uic/baseline/stringlisteditor.ui
tests/auto/uic/baseline/stringlisteditor.ui.h
tests/auto/uic/baseline/tabbedbrowser.ui
tests/auto/uic/baseline/tabbedbrowser.ui.h
tests/auto/uic/baseline/tablewidgeteditor.ui
tests/auto/uic/baseline/tablewidgeteditor.ui.h
tests/auto/uic/baseline/translatedialog.ui
tests/auto/uic/baseline/translatedialog.ui.h
tests/auto/uic/baseline/treewidgeteditor.ui
tests/auto/uic/baseline/treewidgeteditor.ui.h
tests/auto/uic/baseline/trpreviewtool.ui
tests/auto/uic/baseline/trpreviewtool.ui.h
tests/auto/uic3/baseline/about.ui
tests/auto/uic3/baseline/about.ui.4
tests/auto/uic3/baseline/actioneditor.ui
tests/auto/uic3/baseline/actioneditor.ui.4
tests/auto/uic3/baseline/config.ui
tests/auto/uic3/baseline/config.ui.4
tests/auto/uic3/baseline/configtoolboxdialog.ui
tests/auto/uic3/baseline/configtoolboxdialog.ui.4
tests/auto/uic3/baseline/connectiondialog.ui
tests/auto/uic3/baseline/connectiondialog.ui.4
tests/auto/uic3/baseline/createtemplate.ui
tests/auto/uic3/baseline/createtemplate.ui.4
tests/auto/uic3/baseline/customwidgeteditor.ui
tests/auto/uic3/baseline/customwidgeteditor.ui.4
tests/auto/uic3/baseline/dbconnection.ui
tests/auto/uic3/baseline/dbconnection.ui.4
tests/auto/uic3/baseline/dbconnectioneditor.ui
tests/auto/uic3/baseline/dbconnectioneditor.ui.4
tests/auto/uic3/baseline/dbconnections.ui
tests/auto/uic3/baseline/dbconnections.ui.4
tests/auto/uic3/baseline/editfunctions.ui
tests/auto/uic3/baseline/editfunctions.ui.4
tests/auto/uic3/baseline/finddialog.ui
tests/auto/uic3/baseline/finddialog.ui.4
tests/auto/uic3/baseline/formsettings.ui
tests/auto/uic3/baseline/formsettings.ui.4
tests/auto/uic3/baseline/gotolinedialog.ui
tests/auto/uic3/baseline/gotolinedialog.ui.4
tests/auto/uic3/baseline/helpdialog.ui
tests/auto/uic3/baseline/helpdialog.ui.4
tests/auto/uic3/baseline/iconvieweditor.ui
tests/auto/uic3/baseline/iconvieweditor.ui.4
tests/auto/uic3/baseline/listboxeditor.ui
tests/auto/uic3/baseline/listboxeditor.ui.4
tests/auto/uic3/baseline/listeditor.ui
tests/auto/uic3/baseline/listeditor.ui.4
tests/auto/uic3/baseline/listvieweditor.ui
tests/auto/uic3/baseline/listvieweditor.ui.4
tests/auto/uic3/baseline/mainfilesettings.ui
tests/auto/uic3/baseline/mainfilesettings.ui.4
tests/auto/uic3/baseline/mainwindowbase.ui
tests/auto/uic3/baseline/mainwindowbase.ui.4
tests/auto/uic3/baseline/mainwindowwizard.ui
tests/auto/uic3/baseline/mainwindowwizard.ui.4
tests/auto/uic3/baseline/multilineeditor.ui
tests/auto/uic3/baseline/multilineeditor.ui.4
tests/auto/uic3/baseline/newform.ui
tests/auto/uic3/baseline/newform.ui.4
tests/auto/uic3/baseline/paletteeditor.ui
tests/auto/uic3/baseline/paletteeditor.ui.4
tests/auto/uic3/baseline/paletteeditoradvanced.ui
tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
tests/auto/uic3/baseline/pixmapcollectioneditor.ui
tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
tests/auto/uic3/baseline/pixmapfunction.ui
tests/auto/uic3/baseline/pixmapfunction.ui.4
tests/auto/uic3/baseline/preferences.ui
tests/auto/uic3/baseline/preferences.ui.4
tests/auto/uic3/baseline/previewwidget.ui
tests/auto/uic3/baseline/previewwidget.ui.4
tests/auto/uic3/baseline/previewwidgetbase.ui
tests/auto/uic3/baseline/previewwidgetbase.ui.4
tests/auto/uic3/baseline/projectsettings.ui
tests/auto/uic3/baseline/projectsettings.ui.4
tests/auto/uic3/baseline/replacedialog.ui
tests/auto/uic3/baseline/replacedialog.ui.4
tests/auto/uic3/baseline/richtextfontdialog.ui
tests/auto/uic3/baseline/richtextfontdialog.ui.4
tests/auto/uic3/baseline/settingsdialog.ui
tests/auto/uic3/baseline/settingsdialog.ui.4
tests/auto/uic3/baseline/sqlformwizard.ui
tests/auto/uic3/baseline/sqlformwizard.ui.4
tests/auto/uic3/baseline/startdialog.ui
tests/auto/uic3/baseline/startdialog.ui.4
tests/auto/uic3/baseline/statistics.ui
tests/auto/uic3/baseline/statistics.ui.4
tests/auto/uic3/baseline/tabbedbrowser.ui
tests/auto/uic3/baseline/tabbedbrowser.ui.4
tests/auto/uic3/baseline/tableeditor.ui
tests/auto/uic3/baseline/tableeditor.ui.4
tests/auto/uic3/baseline/topicchooser.ui
tests/auto/uic3/baseline/topicchooser.ui.4
tests/auto/uic3/baseline/variabledialog.ui
tests/auto/uic3/baseline/variabledialog.ui.4
tests/auto/uic3/baseline/wizardeditor.ui.4
tests/auto/uiloader/baseline/batchtranslation.ui
tests/auto/uiloader/baseline/config.ui
tests/auto/uiloader/baseline/finddialog.ui
tests/auto/uiloader/baseline/formwindowsettings.ui
tests/auto/uiloader/baseline/helpdialog.ui
tests/auto/uiloader/baseline/listwidgeteditor.ui
tests/auto/uiloader/baseline/mainwindowbase.ui
tests/auto/uiloader/baseline/newactiondialog.ui
tests/auto/uiloader/baseline/newform.ui
tests/auto/uiloader/baseline/orderdialog.ui
tests/auto/uiloader/baseline/paletteeditor.ui
tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
tests/auto/uiloader/baseline/phrasebookbox.ui
tests/auto/uiloader/baseline/plugindialog.ui
tests/auto/uiloader/baseline/previewwidget.ui
tests/auto/uiloader/baseline/previewwidgetbase.ui
tests/auto/uiloader/baseline/qfiledialog.ui
tests/auto/uiloader/baseline/qtgradientdialog.ui
tests/auto/uiloader/baseline/qtgradienteditor.ui
tests/auto/uiloader/baseline/qtgradientviewdialog.ui
tests/auto/uiloader/baseline/saveformastemplate.ui
tests/auto/uiloader/baseline/statistics.ui
tests/auto/uiloader/baseline/stringlisteditor.ui
tests/auto/uiloader/baseline/tabbedbrowser.ui
tests/auto/uiloader/baseline/tablewidgeteditor.ui
tests/auto/uiloader/baseline/translatedialog.ui
tests/auto/uiloader/baseline/treewidgeteditor.ui
tests/auto/uiloader/baseline/trpreviewtool.ui
tools/assistant/compat/mainwindow.cpp
tools/assistant/tools/assistant/mainwindow.cpp
tools/designer/src/designer/versiondialog.cpp
tools/linguist/linguist/mainwindow.cpp
tools/linguist/shared/make-qscript.sh
tools/qdbus/qdbusviewer/qdbusviewer.cpp
Diffstat (limited to 'util')
| -rw-r--r-- | util/qlalr/doc/src/qlalr.qdoc | 41 | ||||
| -rw-r--r-- | util/qlalr/examples/dummy-xml/xml.g | 40 | ||||
| -rw-r--r-- | util/qlalr/examples/glsl/build.sh | 40 | ||||
| -rw-r--r-- | util/qlalr/examples/glsl/glsl.g | 40 | ||||
| -rw-r--r-- | util/qlalr/examples/lambda/lambda.g | 40 | ||||
| -rw-r--r-- | util/qlalr/examples/qparser/calc.g | 40 | ||||
| -rw-r--r-- | util/qlalr/lalr.g | 3 | ||||
| -rw-r--r-- | util/qtscriptparser/make-parser.sh | 40 | ||||
| -rwxr-xr-x | util/scripts/make_qfeatures_dot_h | 26 | ||||
| -rwxr-xr-x | util/unicode/writingSystems.sh | 41 |
10 files changed, 335 insertions, 16 deletions
diff --git a/util/qlalr/doc/src/qlalr.qdoc b/util/qlalr/doc/src/qlalr.qdoc index 313c7a42aa..d95b0651fc 100644 --- a/util/qlalr/doc/src/qlalr.qdoc +++ b/util/qlalr/doc/src/qlalr.qdoc @@ -1,3 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $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 Technology Preview License Agreement accompanying +** this package. +** +** 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.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. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + /*! \page qlalr.html \title qlalr diff --git a/util/qlalr/examples/dummy-xml/xml.g b/util/qlalr/examples/dummy-xml/xml.g index 212c8297c8..61017d53c1 100644 --- a/util/qlalr/examples/dummy-xml/xml.g +++ b/util/qlalr/examples/dummy-xml/xml.g @@ -1,3 +1,43 @@ +---------------------------------------------------------------------------- +-- +-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +-- Contact: Nokia Corporation (qt-info@nokia.com) +-- +-- This file is part of the QtCore module of the Qt Toolkit. +-- +-- $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 Technology Preview License Agreement accompanying +-- this package. +-- +-- 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.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. +-- +-- +-- +-- +-- +-- +-- +-- +-- $QT_END_LICENSE$ +-- +---------------------------------------------------------------------------- %parser XMLTable diff --git a/util/qlalr/examples/glsl/build.sh b/util/qlalr/examples/glsl/build.sh index 031691152e..1b7517f1e0 100644 --- a/util/qlalr/examples/glsl/build.sh +++ b/util/qlalr/examples/glsl/build.sh @@ -1,4 +1,44 @@ #!/bin/sh +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is the build configuration utility of the Qt Toolkit. +## +## $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 Technology Preview License Agreement accompanying +## this package. +## +## 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.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. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# ${FLEX-flex} -oglsl-lex.incl glsl-lex.l ${QLALR-qlalr} glsl.g diff --git a/util/qlalr/examples/glsl/glsl.g b/util/qlalr/examples/glsl/glsl.g index 3f3a3ad573..36461affbf 100644 --- a/util/qlalr/examples/glsl/glsl.g +++ b/util/qlalr/examples/glsl/glsl.g @@ -1,3 +1,43 @@ +---------------------------------------------------------------------------- +-- +-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +-- Contact: Nokia Corporation (qt-info@nokia.com) +-- +-- This file is part of the QtCore module of the Qt Toolkit. +-- +-- $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 Technology Preview License Agreement accompanying +-- this package. +-- +-- 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.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. +-- +-- +-- +-- +-- +-- +-- +-- +-- $QT_END_LICENSE$ +-- +---------------------------------------------------------------------------- %parser GLSLParserTable %merged_output glsl.cpp diff --git a/util/qlalr/examples/lambda/lambda.g b/util/qlalr/examples/lambda/lambda.g index 2fb95940fd..f4a86b9673 100644 --- a/util/qlalr/examples/lambda/lambda.g +++ b/util/qlalr/examples/lambda/lambda.g @@ -1,3 +1,43 @@ +---------------------------------------------------------------------------- +-- +-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +-- Contact: Nokia Corporation (qt-info@nokia.com) +-- +-- This file is part of the QtCore module of the Qt Toolkit. +-- +-- $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 Technology Preview License Agreement accompanying +-- this package. +-- +-- 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.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. +-- +-- +-- +-- +-- +-- +-- +-- +-- $QT_END_LICENSE$ +-- +---------------------------------------------------------------------------- -- lambda calculus diff --git a/util/qlalr/examples/qparser/calc.g b/util/qlalr/examples/qparser/calc.g index 24371d48b7..f3a9d71da7 100644 --- a/util/qlalr/examples/qparser/calc.g +++ b/util/qlalr/examples/qparser/calc.g @@ -1,3 +1,43 @@ +---------------------------------------------------------------------------- +-- +-- Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +-- Contact: Nokia Corporation (qt-info@nokia.com) +-- +-- This file is part of the QtCore module of the Qt Toolkit. +-- +-- $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 Technology Preview License Agreement accompanying +-- this package. +-- +-- 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.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. +-- +-- +-- +-- +-- +-- +-- +-- +-- $QT_END_LICENSE$ +-- +---------------------------------------------------------------------------- %parser calc_grammar %decl calc_parser.h diff --git a/util/qlalr/lalr.g b/util/qlalr/lalr.g index bef30636e9..b20272bde4 100644 --- a/util/qlalr/lalr.g +++ b/util/qlalr/lalr.g @@ -37,9 +37,6 @@ -- -- $QT_END_LICENSE$ -- --- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE --- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. --- ----------------------------------------------------------------------------- diff --git a/util/qtscriptparser/make-parser.sh b/util/qtscriptparser/make-parser.sh index 6620e64650..232cac60bb 100644 --- a/util/qtscriptparser/make-parser.sh +++ b/util/qtscriptparser/make-parser.sh @@ -1,4 +1,44 @@ #!/bin/sh +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is the build configuration utility of the Qt Toolkit. +## +## $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 Technology Preview License Agreement accompanying +## this package. +## +## 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.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. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# me=$(dirname $0) mkdir -p $me/out diff --git a/util/scripts/make_qfeatures_dot_h b/util/scripts/make_qfeatures_dot_h index 9e5ddf1c9b..78945108d6 100755 --- a/util/scripts/make_qfeatures_dot_h +++ b/util/scripts/make_qfeatures_dot_h @@ -94,8 +94,8 @@ print OUT ** 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. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -106,20 +106,20 @@ print OUT ** 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 +** 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. ** -** 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 have questions regarding the use of this file, please contact +** Nokia at qt-info\@nokia.com. +** +** +** +** +** +** +** ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** \$QT_END_LICENSE\$ ** ****************************************************************************/ diff --git a/util/unicode/writingSystems.sh b/util/unicode/writingSystems.sh index 0fdc7a3dc3..521f647e26 100755 --- a/util/unicode/writingSystems.sh +++ b/util/unicode/writingSystems.sh @@ -1,4 +1,45 @@ #!/bin/sh +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is the build configuration utility of the Qt Toolkit. +## +## $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 Technology Preview License Agreement accompanying +## this package. +## +## 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.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. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# + # # This script generates the QFontDatabase::WritingSystem enum. It # uses the Unicode 4.0 Scripts.txt data file as the source, with the |