summaryrefslogtreecommitdiffstats
path: root/src/corelib/xml/qxmlstream.h
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
committerMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
commite3078a5db9e092d78813180ce077789551929e4f (patch)
treefce2a4b5607c8dc796faececf71f78ae83effe4e /src/corelib/xml/qxmlstream.h
parent3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff)
parentdb0ebfd97d14bf3c537957d9642ba014318f8418 (diff)
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/corelib/xml/qxmlstream.h')
-rw-r--r--src/corelib/xml/qxmlstream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index dcf010569..228b147af 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.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$
**
****************************************************************************/
@@ -60,7 +60,7 @@ QT_MODULE(Core)
// keep binary compatibility
//
// The list of supported platforms is in:
-// http://qtsoftware.com/developer/notes/supported_platforms
+// http://qt.nokia.com/developer/notes/supported_platforms
//
// These platforms do not support symbol moving nor duplication
// (because duplicate symbols cause warnings when linking):