Merge branch '4.5' into 4.6

Conflicts:
	demos/boxes/glshaders.cpp
	demos/boxes/vector.h
	demos/embedded/fluidlauncher/pictureflow.cpp
	demos/embedded/fluidlauncher/pictureflow.h
	doc/src/desktop-integration.qdoc
	doc/src/distributingqt.qdoc
	doc/src/examples-overview.qdoc
	doc/src/examples.qdoc
	doc/src/frameworks-technologies/dbus-adaptors.qdoc
	doc/src/geometry.qdoc
	doc/src/groups.qdoc
	doc/src/objecttrees.qdoc
	doc/src/platform-notes.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/qt3support.qdoc
	doc/src/qtdbus.qdoc
	doc/src/qtdesigner.qdoc
	doc/src/qtgui.qdoc
	doc/src/qtmain.qdoc
	doc/src/qtopengl.qdoc
	doc/src/qtsvg.qdoc
	doc/src/qtuiloader.qdoc
	doc/src/qundo.qdoc
	doc/src/richtext.qdoc
	doc/src/topics.qdoc
	src/corelib/tools/qdumper.cpp
	src/gui/embedded/qkbdpc101_qws.cpp
	src/gui/embedded/qkbdsl5000_qws.cpp
	src/gui/embedded/qkbdusb_qws.cpp
	src/gui/embedded/qkbdvr41xx_qws.cpp
	src/gui/embedded/qkbdyopy_qws.cpp
	src/gui/embedded/qmousebus_qws.cpp
	src/gui/embedded/qmousevr41xx_qws.cpp
	src/gui/embedded/qmouseyopy_qws.cpp
	src/gui/painting/qpaintengine_d3d.cpp
	src/gui/painting/qwindowsurface_d3d.cpp
	src/opengl/gl2paintengineex/glgc_shader_source.h
	src/opengl/gl2paintengineex/qglpexshadermanager.cpp
	src/opengl/gl2paintengineex/qglpexshadermanager_p.h
	src/opengl/gl2paintengineex/qglshader.cpp
	src/opengl/gl2paintengineex/qglshader_p.h
	src/opengl/util/fragmentprograms_p.h
	src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
	src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
	src/script/parser/qscript.g
	src/script/qscriptarray_p.h
	src/script/qscriptasm_p.h
	src/script/qscriptbuffer_p.h
	src/script/qscriptclass.cpp
	src/script/qscriptclassdata_p.h
	src/script/qscriptcompiler.cpp
	src/script/qscriptcompiler_p.h
	src/script/qscriptcontext.cpp
	src/script/qscriptcontext_p.cpp
	src/script/qscriptcontext_p.h
	src/script/qscriptcontextfwd_p.h
	src/script/qscriptecmaarray.cpp
	src/script/qscriptecmaarray_p.h
	src/script/qscriptecmaboolean.cpp
	src/script/qscriptecmacore.cpp
	src/script/qscriptecmadate.cpp
	src/script/qscriptecmadate_p.h
	src/script/qscriptecmaerror.cpp
	src/script/qscriptecmaerror_p.h
	src/script/qscriptecmafunction.cpp
	src/script/qscriptecmafunction_p.h
	src/script/qscriptecmaglobal.cpp
	src/script/qscriptecmaglobal_p.h
	src/script/qscriptecmamath.cpp
	src/script/qscriptecmamath_p.h
	src/script/qscriptecmanumber.cpp
	src/script/qscriptecmanumber_p.h
	src/script/qscriptecmaobject.cpp
	src/script/qscriptecmaobject_p.h
	src/script/qscriptecmaregexp.cpp
	src/script/qscriptecmaregexp_p.h
	src/script/qscriptecmastring.cpp
	src/script/qscriptecmastring_p.h
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptengine_p.h
	src/script/qscriptenginefwd_p.h
	src/script/qscriptextenumeration.cpp
	src/script/qscriptextenumeration_p.h
	src/script/qscriptextqobject.cpp
	src/script/qscriptextqobject_p.h
	src/script/qscriptextvariant.cpp
	src/script/qscriptfunction.cpp
	src/script/qscriptfunction_p.h
	src/script/qscriptgc_p.h
	src/script/qscriptmember_p.h
	src/script/qscriptobject_p.h
	src/script/qscriptprettypretty.cpp
	src/script/qscriptprettypretty_p.h
	src/script/qscriptvalue.cpp
	src/script/qscriptvalueimpl.cpp
	src/script/qscriptvalueimpl_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/qscriptvalueiteratorimpl.cpp
	src/script/qscriptxmlgenerator.cpp
	src/script/qscriptxmlgenerator_p.h
	tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
	tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp
	tools/linguist/shared/cpp.cpp

1 files changed, 13 insertions, 13 deletions

diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 624336f..040d186 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -9,8 +9,8 @@
 ** 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
@@ -21,20 +21,20 @@
 ** 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$
 **
 ****************************************************************************/