summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/legal/licenses-fonts.qdoc8
-rw-r--r--doc/src/legal/opensourcelicense.qdoc2
-rw-r--r--doc/src/platforms/windows.qdoc6
3 files changed, 6 insertions, 10 deletions
diff --git a/doc/src/legal/licenses-fonts.qdoc b/doc/src/legal/licenses-fonts.qdoc
index 824812a8..afca99c1 100644
--- a/doc/src/legal/licenses-fonts.qdoc
+++ b/doc/src/legal/licenses-fonts.qdoc
@@ -33,12 +33,8 @@
\brief Information about the licenses of fonts supplied with Qt
The fonts supplied with Qt are intended for use with embedded systems,
- and have been obtained under a
- variety of different licenses listed below.
-
- \tableofcontents
-
- See also: \l{Other Licenses Used in Qt}
+ and have been obtained under a variety of different licenses listed
+ below.
\section1 Adobe Helvetica
diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc
index 6a1c8de4..e847d780 100644
--- a/doc/src/legal/opensourcelicense.qdoc
+++ b/doc/src/legal/opensourcelicense.qdoc
@@ -60,7 +60,7 @@
\li Open Source licensing: \l http://www.opensource.org/
\endlist
- See \l{Licensing Information} for a collection of documents about licenses
+ See \l{Licenses Used in Qt} for a collection of documents about licenses
used in Qt.
Information about Qt Commercial License Agreements is available
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index ba320aef..bdb1f4c2 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -89,11 +89,11 @@
Qt's vibrant and active community site, \l{http://qt.io} houses
a wiki, a forum, and additional learning guides and presentations.
- \section2 Visual Studio Add-in
+ \section2 Visual Studio Tools
- The \l {Qt Visual Studio Add-in} allows programmers to create, build, debug
+ The \l {Qt VS Tools} allows programmers to create, build, debug
and run Qt applications from within non-Express versions of Microsoft Visual Studio
- 2008, 2010, and 2012. The add-in contains project wizards, Qt project import/export
+ 2013 and later. The add-in contains project wizards, Qt project import/export
support, integrated Qt resource manager and automated build setup for
the Qt Meta-Object Compiler, User Interface Compiler, and Resource
Compiler.