cpython.git - https://github.com/python/cpython.git

diff options

Diffstat (limited to 'Python/getversion.c')

0 files changed, 0 insertions, 0 deletions

+------- tests/auto/uic3/baseline/actioneditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/config.ui | 56 +++++++++------- tests/auto/uic3/baseline/config.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/configtoolboxdialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/configtoolboxdialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/connectiondialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/connectiondialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/createtemplate.ui | 56 +++++++++------- tests/auto/uic3/baseline/createtemplate.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/customwidgeteditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/customwidgeteditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/dbconnection.ui | 56 +++++++++------- tests/auto/uic3/baseline/dbconnection.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/dbconnectioneditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/dbconnectioneditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/dbconnections.ui | 56 +++++++++------- tests/auto/uic3/baseline/dbconnections.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/editfunctions.ui | 56 +++++++++------- tests/auto/uic3/baseline/editfunctions.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/finddialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/finddialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/formsettings.ui | 56 +++++++++------- tests/auto/uic3/baseline/formsettings.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/gotolinedialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/gotolinedialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/helpdialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/helpdialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/iconvieweditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/iconvieweditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/listboxeditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/listboxeditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/listeditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/listeditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/listvieweditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/listvieweditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/mainfilesettings.ui | 56 +++++++++------- tests/auto/uic3/baseline/mainfilesettings.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/mainwindowbase.ui | 56 +++++++++------- tests/auto/uic3/baseline/mainwindowbase.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/mainwindowwizard.ui | 56 +++++++++------- tests/auto/uic3/baseline/mainwindowwizard.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/multilineeditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/multilineeditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/newform.ui | 56 +++++++++------- tests/auto/uic3/baseline/newform.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/paletteeditor.ui | 62 ++++++++++-------- tests/auto/uic3/baseline/paletteeditor.ui.4 | 62 ++++++++++-------- tests/auto/uic3/baseline/paletteeditoradvanced.ui | 56 +++++++++------- .../auto/uic3/baseline/paletteeditoradvanced.ui.4 | 56 +++++++++------- .../uic3/baseline/paletteeditoradvancedbase.ui | 56 +++++++++------- .../uic3/baseline/paletteeditoradvancedbase.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/pixmapcollectioneditor.ui | 56 +++++++++------- .../auto/uic3/baseline/pixmapcollectioneditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/pixmapfunction.ui | 56 +++++++++------- tests/auto/uic3/baseline/pixmapfunction.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/preferences.ui | 56 +++++++++------- tests/auto/uic3/baseline/preferences.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/previewwidget.ui | 56 +++++++++------- tests/auto/uic3/baseline/previewwidget.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/previewwidgetbase.ui | 56 +++++++++------- tests/auto/uic3/baseline/previewwidgetbase.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/projectsettings.ui | 56 +++++++++------- tests/auto/uic3/baseline/projectsettings.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/replacedialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/replacedialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/richtextfontdialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/richtextfontdialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/settingsdialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/settingsdialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/sqlformwizard.ui | 56 +++++++++------- tests/auto/uic3/baseline/sqlformwizard.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/startdialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/startdialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/statistics.ui | 56 +++++++++------- tests/auto/uic3/baseline/statistics.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/tabbedbrowser.ui | 56 +++++++++------- tests/auto/uic3/baseline/tabbedbrowser.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/tableeditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/tableeditor.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/topicchooser.ui | 56 +++++++++------- tests/auto/uic3/baseline/topicchooser.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/variabledialog.ui | 56 +++++++++------- tests/auto/uic3/baseline/variabledialog.ui.4 | 56 +++++++++------- tests/auto/uic3/baseline/wizardeditor.ui | 56 +++++++++------- tests/auto/uic3/baseline/wizardeditor.ui.4 | 56 +++++++++------- tests/auto/uiloader/baseline/batchtranslation.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/config.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/finddialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/formwindowsettings.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/helpdialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/listwidgeteditor.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/mainwindowbase.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/newactiondialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/newform.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/orderdialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/paletteeditor.ui | 59 ++++++++--------- .../uiloader/baseline/paletteeditoradvancedbase.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/phrasebookbox.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/plugindialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/previewwidget.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/previewwidgetbase.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/qfiledialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/qtgradientdialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/qtgradienteditor.ui | 59 ++++++++--------- .../auto/uiloader/baseline/qtgradientviewdialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/saveformastemplate.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/statistics.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/stringlisteditor.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/tabbedbrowser.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/tablewidgeteditor.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/translatedialog.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/treewidgeteditor.ui | 59 ++++++++--------- tests/auto/uiloader/baseline/trpreviewtool.ui | 59 ++++++++--------- tools/assistant/compat/mainwindow.cpp | 5 +- tools/assistant/compat/mainwindow.ui | 4 +- tools/assistant/tools/assistant/mainwindow.cpp | 5 +- tools/designer/src/designer/versiondialog.cpp | 4 +- tools/designer/src/lib/shared/qlayout_widget.cpp | 3 - tools/installer/batch/build.bat | 3 - tools/installer/batch/copy.bat | 3 - tools/installer/batch/delete.bat | 3 - tools/installer/batch/env.bat | 3 - tools/installer/batch/extract.bat | 3 - tools/installer/batch/installer.bat | 3 - tools/installer/batch/log.bat | 3 - tools/installer/batch/toupper.bat | 3 - tools/installer/config/config.default.sample | 3 - tools/installer/config/mingw-opensource.conf | 3 - tools/installer/iwmake.bat | 3 - tools/installer/nsis/confirmpage.ini | 3 - tools/installer/nsis/gwdownload.ini | 3 - tools/installer/nsis/gwmirror.ini | 3 - tools/installer/nsis/includes/global.nsh | 5 +- tools/installer/nsis/includes/instdir.nsh | 5 +- tools/installer/nsis/includes/list.nsh | 5 +- tools/installer/nsis/includes/qtcommon.nsh | 5 +- tools/installer/nsis/includes/qtenv.nsh | 3 - tools/installer/nsis/includes/system.nsh | 5 +- tools/installer/nsis/installer.nsi | 3 - tools/installer/nsis/modules/environment.nsh | 3 - tools/installer/nsis/modules/mingw.nsh | 3 - tools/installer/nsis/modules/opensource.nsh | 4 -- tools/installer/nsis/modules/registeruiext.nsh | 3 - tools/installer/nsis/opensource.ini | 3 - tools/linguist/linguist/mainwindow.cpp | 4 +- tools/linguist/shared/qscript.g | 3 - tools/qdbus/qdbusviewer/qdbusviewer.cpp | 5 +- tools/qtconfig/mainwindow.cpp | 5 +- tools/xmlpatterns/main.h | 4 -- tools/xmlpatterns/qcoloringmessagehandler_p.h | 4 -- tools/xmlpatterns/qcoloroutput.cpp | 3 - tools/xmlpatterns/qcoloroutput_p.h | 4 -- util/qlalr/lalr.g | 3 - 230 files changed, 5624 insertions(+), 4940 deletions(-) diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat index 93b28d3..ebed731 100755 --- a/bin/setcepaths.bat +++ b/bin/setcepaths.bat @@ -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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @echo off IF "%1" EQU "wincewm50pocket-msvc2005" ( diff --git a/bin/syncqt.bat b/bin/syncqt.bat index f5c34ea..a619b92 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -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. -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @rem ***** This assumes PERL is in the PATH ***** @perl.exe -S syncqt %* diff --git a/configure b/configure index c519ab1..af8c209 100755 --- a/configure +++ b/configure @@ -1,13 +1,44 @@ #!/bin/sh -# -# Configures to build the Qt library -# -# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Nokia Corporation (qt-info@nokia.com) -# -# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# +############################################################################# +## +## 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$ +## +############################################################################# #------------------------------------------------------------------------------- # script initialization diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g index d957a1c..8e2f3fd 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/xml/qxmlstream.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. --- ---------------------------------------------------------------------------- %parser QXmlStreamReader_Table diff --git a/src/gui/dialogs/qfiledialog_wince.ui b/src/gui/dialogs/qfiledialog_wince.ui index 454af4b..1bd189e 100644 --- a/src/gui/dialogs/qfiledialog_wince.ui +++ b/src/gui/dialogs/qfiledialog_wince.ui @@ -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. -** ********************************************************************* QFileDialog diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/kernel/qcocoaapplication_mac.mm index ed62d02..2f1d88d 100644 --- a/src/gui/kernel/qcocoaapplication_mac.mm +++ b/src/gui/kernel/qcocoaapplication_mac.mm @@ -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/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm index ac66d40..2d4b3b8 100644 --- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm +++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm @@ -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/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index 1bdb123..14e4510 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -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. -** ****************************************************************************/ #include "qmacdefines_mac.h" diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm index 7674e60..523ee0d 100644 --- a/src/gui/kernel/qcocoawindow_mac.mm +++ b/src/gui/kernel/qcocoawindow_mac.mm @@ -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. -** ****************************************************************************/ #include "qmacdefines_mac.h" diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm index 0a7a00f..6704fda 100644 --- a/src/gui/kernel/qcocoawindowdelegate_mac.mm +++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm @@ -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. -** ****************************************************************************/ #import "private/qcocoawindowdelegate_mac_p.h" diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm index be0feab..e258524 100644 --- a/src/gui/widgets/qcocoamenu_mac.mm +++ b/src/gui/widgets/qcocoamenu_mac.mm @@ -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. -** ****************************************************************************/ #include "qmacdefines_mac.h" diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm index 2ed2e5f..a45d992 100644 --- a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.mm @@ -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. -** ****************************************************************************/ #import diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm index 28fa1ec..224a51f 100644 --- a/src/gui/widgets/qmacnativewidget_mac.mm +++ b/src/gui/widgets/qmacnativewidget_mac.mm @@ -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. -** ****************************************************************************/ #import diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index f093165..429a479 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -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. -** ****************************************************************************/ #include diff --git a/src/script/qscript.g b/src/script/qscript.g index bf5a65c..32ab1de 100644 --- a/src/script/qscript.g +++ b/src/script/qscript.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. --- ---------------------------------------------------------------------------- %parser QScriptGrammar diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui index 7adb650..536bb2b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui +++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui @@ -2,14 +2,42 @@ ********************************************************************* ** -** Copyright (C) 1992-$THISYEAR$ Trolltech AS. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the test suite of the Qt Toolkit. ** -** $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 Technology Preview License Agreement accompanying +** this package. ** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** 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$ ** ********************************************************************* diff --git a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui index c10545d..bd24711 100644 --- a/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui +++ b/tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui @@ -2,14 +2,42 @@


context:
space:
mode: