summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/deployment/deployment.qdoc2
-rw-r--r--doc/src/development/developing-with-qt.qdoc2
-rw-r--r--doc/src/frameworks-technologies/containers.qdoc2
-rw-r--r--doc/src/frameworks-technologies/model-view-programming.qdoc2
-rw-r--r--doc/src/getting-started/demos.qdoc2
-rw-r--r--doc/src/overviews.qdoc7
-rw-r--r--doc/src/porting/porting4.qdoc4
-rw-r--r--doc/src/porting/qt4-tulip.qdoc2
-rw-r--r--doc/src/qt4-intro.qdoc2
-rw-r--r--src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc2
-rw-r--r--src/corelib/global/qglobal.cpp5
-rw-r--r--src/corelib/tools/qpair.qdoc4
-rw-r--r--src/dbus/qdbusargument.cpp4
-rw-r--r--src/xmlpatterns/api/qxmlquery.cpp7
14 files changed, 24 insertions, 23 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 4573f3c..020ca16 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -155,7 +155,7 @@
\row \o QtWebKit \o WebKit
\o WebKit is licensed under the GNU LGPL version 2 or later.
This has implications for developers of closed source applications.
- Please see \l{QtWebKit Module#License Information}{the QtWebKit module
+ Please see \l{WebKit in Qt#License Information}{the QtWebKit module
documentation} for more information.
\row \o \l{Phonon Module}{Phonon} \o Phonon
diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc
index f9b38b8..b88fe3f 100644
--- a/doc/src/development/developing-with-qt.qdoc
+++ b/doc/src/development/developing-with-qt.qdoc
@@ -83,7 +83,7 @@
\o \l {Known Issues}
\o \l {Platform Notes}
\o \l {Platform Notes - Symbian}
- \o \l {Qt For ActiveX}
+ \o \l {ActiveX in Qt}
\o \l {Qt for Embedded Linux Classes}
\o \l {Qt for Embedded Platforms}
\o \l {Qt for Mac OS X - Specific Issues}
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 58061ad..797326e 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -43,7 +43,7 @@
/*!
\page containers.html
- \title Generic Containers
+ \title Container Classes
\ingroup technology-apis
\ingroup groups
\keyword container class
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 131f063..7167f97 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -1011,7 +1011,7 @@
\snippet doc/src/snippets/reading-selections/window.cpp 0
- The above code uses Qt's convenient \l{Generic Containers}{foreach
+ The above code uses Qt's convenient \l{Container Classes}{foreach
keyword} to iterate over, and modify, the items corresponding to the
indexes returned by the selection model.
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index ef16224..94b19c3 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -134,7 +134,7 @@
\section1 QtWebKit
\list
- \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module}
+ \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module}
can be used to implement a small Web browser.
\endlist
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 3c02705..caf9404 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -91,11 +91,12 @@
/*!
\group qt-activex
- \title Qt For ActiveX
- \brief Qt API's for using ActiveX controls, servers, and COM.
+ \title ActiveX in Qt
\ingroup technology-apis
\ingroup platform-specific
+ \brief Qt API's for using ActiveX controls, servers, and COM.
+
These pages document Qt's API's for developing with ActiveX
controls, servers, and COM.
@@ -104,7 +105,7 @@
/*!
\group qt-sql
- \title Using SQL in Qt
+ \title SQL in Qt
\brief Qt API's for using SQL.
\ingroup technology-apis
\ingroup best-practices
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index 0bbf35f..7b80e13 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -2598,7 +2598,7 @@
seems feeble.
\endomit
- See \l{Generic Containers} for a list of Qt 4 containers.
+ See \l{Container Classes} for a list of Qt 4 containers.
\section1 QPtrDict<T>
@@ -3939,7 +3939,7 @@
check the index against QVector::size() yourself.
\endlist
- See \l{Generic Containers} for an overview of the Qt 4 container
+ See \l{Container Classes} for an overview of the Qt 4 container
classes.
\section1 QVariant
diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc
index 08542a6..333af84 100644
--- a/doc/src/porting/qt4-tulip.qdoc
+++ b/doc/src/porting/qt4-tulip.qdoc
@@ -97,7 +97,7 @@
you are iterating, that won't affect the loop.
For details about the new containers, see the
- \l{Generic Containers} and \l{Generic Algorithms} overview documents.
+ \l{Container Classes} and \l{Generic Algorithms} overview documents.
In addition to the new containers, considerable work has also gone into
QByteArray and QString. The Qt 3 QCString class has been
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 8867fd9..88ef2a8 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -86,7 +86,7 @@
In Qt 4.4:
\list
- \o \l{QtWebkit Module}{Qt WebKit integration}, making it possible for developers
+ \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers
to use a fully-featured Web browser to display documents and access online
services.
\o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}.
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index d3f5502..0335d46 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -1,6 +1,6 @@
/*!
\module QtWebKit
- \title QtWebKit Module
+ \title WebKit in Qt
\contentspage All Qt Modules
\previouspage QtSvg
\nextpage QtXml
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 0e3a8d3..af35316 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2914,8 +2914,9 @@ int qrand()
\relates <QtGlobal>
You can use this macro to specify information about a custom type
- \a Type. With accurate type information, Qt's \l{generic
- containers} can choose appropriate storage methods and algorithms.
+ \a Type. With accurate type information, Qt's \l{Container Classes}
+ {generic containers} can choose appropriate storage methods and
+ algorithms.
\a Flags can be one of the following:
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index e60243f..d49c09e 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -35,7 +35,7 @@
pair type is not available. It stores one value of type T1 and
one value of type T2. It can be used as a return value for a
function that needs to return two values, or as the value type of
- a \l{generic container}.
+ a \l{Container classes}{generic container}.
Here's an example of a QPair that stores one QString and one \c
double value:
@@ -53,7 +53,7 @@
requirements; these requirements are documented on a per-function
basis.
- \sa {Generic Containers}
+ \sa {Container Classes}
*/
/*! \typedef QPair::first_type
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index fbbc6a2..0bde085 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -825,7 +825,7 @@ void QDBusArgument::endStructure()
\snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 6
If the type you want to marshall is a QList, QVector or any of the
- Qt's \l {Generic Containers} that take one template parameter,
+ Qt's \l {Container Classes} that take one template parameter,
you need not declare an \c{operator<<} function for it, since
QtDBus provides generic templates to do the job of marshalling
the data. The same applies for STL's sequence containers, such
@@ -952,7 +952,7 @@ void QDBusArgument::endStructure() const
\snippet doc/src/snippets/code/src_qdbus_qdbusargument.cpp 9
If the type you want to demarshall is a QList, QVector or any of the
- Qt's \l {Generic Containers} that take one template parameter, you
+ Qt's \l {Container Classes} that take one template parameter, you
need not declare an \c{operator>>} function for it, since QtDBus
provides generic templates to do the job of demarshalling the data.
The same applies for STL's sequence containers, such as \c {std::list},
diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp
index e106d74..55af49b 100644
--- a/src/xmlpatterns/api/qxmlquery.cpp
+++ b/src/xmlpatterns/api/qxmlquery.cpp
@@ -151,8 +151,8 @@ QT_BEGIN_NAMESPACE
\endcode
\note For the current release, XSLT support should be considered
- experimental. See section \l{Using XML technologies#XSLT
- 2.0}{XSLT conformance} for details.
+ experimental. See section \l{XQuery#XSLT 2.0} {XSLT conformance} for
+ details.
Stylesheet parameters are bound using bindVariable().
@@ -291,8 +291,7 @@ QXmlQuery::QXmlQuery(const QXmlNamePool &np) : d(new QXmlQueryPrivate(np))
create instances of QXmlQuery for running XQueries.
\note The XSL-T support in this release is considered experimental.
- See the \l{Using XML technologies#XSLT 2.0}{XSLT conformance} for
- details.
+ See the \l{XQuery#XSLT 2.0} {XSLT conformance} for details.
\since 4.5
\sa queryLanguage()
generated by cgit v0.12 at 2024-11-15 12:02:32 (GMT)