From 812b3940012f3c04fb79b8fa8c4ac64ff8051dd4 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 13:21:45 +1000
Subject: Update contact URL in license headers.

Reviewed-by: Trust Me
---
 demos/mediaplayer/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demos/mediaplayer/main.cpp')

diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index cac77af427..8c921fcd8a 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$
 **
 ***************************************************************************/
-- 
cgit v1.2.1


From 1047445648b7eb5b85107c00ea43885b44f891cd Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 12 Aug 2009 17:04:56 +1000
Subject: Replace some mentions of Trolltech with more appropriate terms.

Reviewed-by: Trust Me
---
 demos/mediaplayer/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'demos/mediaplayer/main.cpp')

diff --git a/demos/mediaplayer/main.cpp b/demos/mediaplayer/main.cpp
index 8c921fcd8a..8a6d71e681 100644
--- a/demos/mediaplayer/main.cpp
+++ b/demos/mediaplayer/main.cpp
@@ -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();
-- 
cgit v1.2.1