Merge commit 'qt-mainline/4.6' into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsitem.h
	src/gui/graphicsview/qgraphicsscene.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

5 files changed, 20 insertions, 20 deletions

diff --git a/bin/createpackage.bat b/bin/createpackage.bat
index 87d094f..7381888 100644
--- a/bin/createpackage.bat
+++ b/bin/createpackage.bat
@@ -1,6 +1,7 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
 :: This file is part of the test suite of the Qt Toolkit.
@@ -20,10 +21,9 @@
 :: 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.
+:: 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.
diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 1a83abb..4597b04 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -2,6 +2,7 @@
 #############################################################################
 ##
 ## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
 ## This file is part of the S60 port of the Qt Toolkit.
@@ -21,10 +22,9 @@
 ## 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.
+## 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.
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 8140207..2fcf703 100644
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -2,6 +2,7 @@
 #############################################################################
 ##
 ## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
 ## This file is part of the S60 port of the Qt Toolkit.
@@ -21,10 +22,9 @@
 ## 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.
+## 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.
diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat
index ebed731..15d8ff8 100755
--- a/bin/setcepaths.bat
+++ b/bin/setcepaths.bat
@@ -1,6 +1,7 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
 :: This file is part of the tools applications of the Qt Toolkit.
@@ -20,10 +21,9 @@
 :: 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.
+:: 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.
diff --git a/bin/syncqt.bat b/bin/syncqt.bat
index a619b92..43dff5e 100755
--- a/bin/syncqt.bat
+++ b/bin/syncqt.bat
@@ -1,6 +1,7 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
 :: This file is part of the tools applications of the Qt Toolkit.
@@ -20,10 +21,9 @@
 :: 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.
+:: 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.