summaryrefslogtreecommitdiffstats
path: root/doc/src/classes.qdoc
diff options
context:
space:
mode:
authorTobias Koenig <tokoe@kde.org>2009-07-05 08:47:45 (GMT)
committerTobias Koenig <tokoe@kde.org>2009-07-05 08:47:45 (GMT)
commit5db5a9d5d878157a643a441d426ff739084ca031 (patch)
treed10017bbc11e62e44a7ced7e35de8516964e794a /doc/src/classes.qdoc
parent65c2d095cddfda32052925654dd1defd314ad4b3 (diff)
parent84bbac2a4d7b663e57b74094cbebf8fca16e0ed8 (diff)
downloadQt-5db5a9d5d878157a643a441d426ff739084ca031.zip
Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.gz
Qt-5db5a9d5d878157a643a441d426ff739084ca031.tar.bz2
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'doc/src/classes.qdoc')
-rw-r--r--doc/src/classes.qdoc7
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index c25da2b..dddc96f 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -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$
**
****************************************************************************/
@@ -47,9 +47,6 @@
This is a list of all Qt classes excluding the \l{Qt 3
compatibility classes}. For a shorter list that only includes the
most frequently used classes, see \l{Qt's Main Classes}.
- \omit This is old and dingy now.
- and the \l{http://doc.trolltech.com/extras/qt43-class-chart.pdf}{Qt 4.3 Class Chart (PDF)}.
- \endomit
\generatelist classes