Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 3 insertions, 3 deletions

diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index cac77af42..8a6d71e68 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();