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

1 files changed, 32 insertions, 24 deletions

diff --git a/tests/auto/uic3/baseline/wizardeditor.ui b/tests/auto/uic3/baseline/wizardeditor.ui
index 2a32879..7dfd82f 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui
+++ b/tests/auto/uic3/baseline/wizardeditor.ui
@@ -1,35 +1,43 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>WizardEditorBase</class>
 <comment>*********************************************************************
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).  All rights reserved.
 **
-** This file is part of Qt Designer.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Nokia Corporation and/or its subsidiary(-ies) (or its successors, if any)
-** and the KDE Free Qt Foundation.
+** This file is part of the test suite of the Qt Toolkit.
 **
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
+** $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.
 **
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with
-** the Software.
+** 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.
 **
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
+** 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$
 **
 *********************************************************************</comment>
 <widget class="QDialog">