summaryrefslogtreecommitdiffstats
path: root/doc/src/platforms/winsystem.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-26 00:14:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-26 00:14:57 (GMT)
commitd67a5534cb50f66807b87526d42603c7d4df3595 (patch)
treef8ac995ec6dd183649a3614412f8ecfc043cd1b1 /doc/src/platforms/winsystem.qdoc
parent01550804c1fdb042b8b58528f716888e729be868 (diff)
parenta2cede57d2ff5358148a25d6a41de777144a5fe7 (diff)
downloadQt-d67a5534cb50f66807b87526d42603c7d4df3595.zip
Qt-d67a5534cb50f66807b87526d42603c7d4df3595.tar.gz
Qt-d67a5534cb50f66807b87526d42603c7d4df3595.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: add autotest for QString::setRawData() Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
Diffstat (limited to 'doc/src/platforms/winsystem.qdoc')
-rw-r--r--doc/src/platforms/winsystem.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/platforms/winsystem.qdoc b/doc/src/platforms/winsystem.qdoc
index 2919bb7..64e35c5 100644
--- a/doc/src/platforms/winsystem.qdoc
+++ b/doc/src/platforms/winsystem.qdoc
@@ -44,8 +44,8 @@
\tableofcontents
For information about which platforms are supported by Qt, see the
- \l{Platform Notes}. For information on distributing Qt applications, see
- \l{Deploying Qt Applications}.
+ \l{Platform and Compiler Notes}. For information on distributing Qt
+ applications, see \l{Deploying Qt Applications}.
\target x11
\section1 Qt for X11