Merge commit 'qt/master'

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

6 files changed, 6 insertions, 6 deletions

diff --git a/examples/desktop/screenshot/main.cpp b/examples/desktop/screenshot/main.cpp
index 1cd63451a3..8625e9fa8b 100644
--- a/examples/desktop/screenshot/main.cpp
+++ b/examples/desktop/screenshot/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/desktop/screenshot/screenshot.cpp b/examples/desktop/screenshot/screenshot.cpp
index e5ccafdf7f..46ab7cf423 100644
--- a/examples/desktop/screenshot/screenshot.cpp
+++ b/examples/desktop/screenshot/screenshot.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/desktop/screenshot/screenshot.h b/examples/desktop/screenshot/screenshot.h
index cc63eef5b8..d4bce34db1 100644
--- a/examples/desktop/screenshot/screenshot.h
+++ b/examples/desktop/screenshot/screenshot.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/desktop/systray/main.cpp b/examples/desktop/systray/main.cpp
index 76ed346de3..aa4b146fa3 100644
--- a/examples/desktop/systray/main.cpp
+++ b/examples/desktop/systray/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/desktop/systray/window.cpp b/examples/desktop/systray/window.cpp
index 1bd4a6e00e..df941a2f2f 100644
--- a/examples/desktop/systray/window.cpp
+++ b/examples/desktop/systray/window.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/desktop/systray/window.h b/examples/desktop/systray/window.h
index 99b31912c3..567f6d41bf 100644
--- a/examples/desktop/systray/window.h
+++ b/examples/desktop/systray/window.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/