summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/textdocument-selections
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-06-19 02:06:21 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-06-19 02:06:21 (GMT)
commitfb6775d423f1ebe7e624951edf39d79ca0433d4a (patch)
tree4b5b93d3c2d835b268ce16f2fe9a91e4b89ecfde /doc/src/snippets/textdocument-selections
parent9c7c859647771d5d2fa466b0a3ff9d408edecd38 (diff)
parentf9f08de9d41fd55d9c7d01578191ef5d4099c9e6 (diff)
downloadQt-fb6775d423f1ebe7e624951edf39d79ca0433d4a.zip
Qt-fb6775d423f1ebe7e624951edf39d79ca0433d4a.tar.gz
Qt-fb6775d423f1ebe7e624951edf39d79ca0433d4a.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'doc/src/snippets/textdocument-selections')
-rw-r--r--doc/src/snippets/textdocument-selections/main.cpp4
-rw-r--r--doc/src/snippets/textdocument-selections/mainwindow.cpp4
-rw-r--r--doc/src/snippets/textdocument-selections/mainwindow.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/snippets/textdocument-selections/main.cpp b/doc/src/snippets/textdocument-selections/main.cpp
index 96dc33e..7bf2188 100644
--- a/doc/src/snippets/textdocument-selections/main.cpp
+++ b/doc/src/snippets/textdocument-selections/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/snippets/textdocument-selections/mainwindow.cpp b/doc/src/snippets/textdocument-selections/mainwindow.cpp
index 47f626b..1a74322 100644
--- a/doc/src/snippets/textdocument-selections/mainwindow.cpp
+++ b/doc/src/snippets/textdocument-selections/mainwindow.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/doc/src/snippets/textdocument-selections/mainwindow.h b/doc/src/snippets/textdocument-selections/mainwindow.h
index effe935..ba419e3 100644
--- a/doc/src/snippets/textdocument-selections/mainwindow.h
+++ b/doc/src/snippets/textdocument-selections/mainwindow.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -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 qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/