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

3 files changed, 5 insertions, 5 deletions

diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index cac77af..8a6d71e 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/mediaplayer/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$
 **
 ***************************************************************************/
@@ -47,9 +47,9 @@ int main (int argc, char *argv[])
     Q_INIT_RESOURCE(mediaplayer);
     QApplication app(argc, argv);
     app.setApplicationName("Media Player");
-    app.setOrganizationName("Trolltech");
+    app.setOrganizationName("Qt");
     app.setQuitOnLastWindowClosed(true);
-    
+
     QString fileString = app.arguments().value(1);
     MediaPlayer player(fileString);
     player.show();
diff --git a/demos/mediaplayer/mediaplayer.cpp b/demos/mediaplayer/mediaplayer.cpp
index 6ce823f..5a69e4f 100644
--- a/demos/mediaplayer/mediaplayer.cpp
+++ b/demos/mediaplayer/mediaplayer.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/demos/mediaplayer/mediaplayer.h b/demos/mediaplayer/mediaplayer.h
index 509ff94..44ca9c0 100644
--- a/demos/mediaplayer/mediaplayer.h
+++ b/demos/mediaplayer/mediaplayer.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$
 **
 ***************************************************************************/