summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2014-03-27 15:58:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 16:50:13 +0200
commit5ab7ea49baac2e522dc2bd267f9ce939c5fdf67f (patch)
tree97e8b21172b614ac61ba473227a881a089999db6
parent36b8baa692dcaf81b5a621730efd65521328f8f5 (diff)
downloadqtdoc-5ab7ea49baac2e522dc2bd267f9ce939c5fdf67f.tar.gz
Doc: corrected broken links
Task-number: QTBUG-34749 Change-Id: I14d0d04a0f6c1a02fe3ada4b61823f68c81a6985 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/config/qtdoc.qdocconf1
-rw-r--r--doc/src/core.qdoc1
-rw-r--r--doc/src/frameworks-technologies/threads-basics.qdoc2
-rw-r--r--doc/src/howtos/third-party-libraries.qdoc2
-rw-r--r--doc/src/platforms/wince-opengl.qdoc7
5 files changed, 3 insertions, 10 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index a467f567..65dac916 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -42,6 +42,7 @@ depends += \
qtsql \
qtsvg \
qttestlib \
+ qttools \
qtuitools \
qtwebsockets \
qtwidgets \
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc
index 9119ed62..ebfef223 100644
--- a/doc/src/core.qdoc
+++ b/doc/src/core.qdoc
@@ -122,7 +122,6 @@ Qt applications which support third-party plugins.
\list
\li \l{Qt Platform Abstraction}
-\li \l{Wayland Support in Qt}
\li \l{Implementing Atomic Operations} - for new architectures
\li \l{How to Create Qt Plugins}
\endlist
diff --git a/doc/src/frameworks-technologies/threads-basics.qdoc b/doc/src/frameworks-technologies/threads-basics.qdoc
index 22068994..ad2abfda 100644
--- a/doc/src/frameworks-technologies/threads-basics.qdoc
+++ b/doc/src/frameworks-technologies/threads-basics.qdoc
@@ -230,8 +230,6 @@
can help you go into the subject in more depth:
\list
- \li Good video tutorials about threads with Qt can be found in the material
- from the \l{Training Day at Qt Developer Days 2009}.
\li The \l{Thread Support in Qt} document is a good starting point into
the reference documentation.
\li Qt comes with several additional examples for
diff --git a/doc/src/howtos/third-party-libraries.qdoc b/doc/src/howtos/third-party-libraries.qdoc
index 26ce8f7a..7c1356bc 100644
--- a/doc/src/howtos/third-party-libraries.qdoc
+++ b/doc/src/howtos/third-party-libraries.qdoc
@@ -150,5 +150,5 @@
LIBS += -L"3rdparty/CatWhisperer/lib" -lCatWhisperer
\endcode
- \sa {qmake Manual}, {Declaring Other Libraries}
+ \sa {qmake Manual}, {Qt Creator: Adding Libraries to Projects}
*/
diff --git a/doc/src/platforms/wince-opengl.qdoc b/doc/src/platforms/wince-opengl.qdoc
index 56d3123b..edea749b 100644
--- a/doc/src/platforms/wince-opengl.qdoc
+++ b/doc/src/platforms/wince-opengl.qdoc
@@ -54,16 +54,11 @@ profile. Ensure that the \c{lib} and \c{includes} paths include the OpenGL ES
headers and libararies from your SDK. The OpenGL ES lib should be called
either \c{libGLES_CM.lib} for the Common profile.
-To start programming with Qt and OpenGL ES on Windows CE, you can start
-with the \l{Hello GL ES Example}. This example shows how to use QGLWidget
-and QGLPainter with OpenGL ES. It also provides some hints on how to port
-OpenGL code to OpenGL ES.
-
\section2 Using OpenGL to Accelerate Normal 2D Painting
Qt provides QOpenGLPaintEngine, a subclass of QPaintEngine that translates
QPainter operations into OpenGL calls. This is especially convenient for
drawing text or QImage objects in an OpenGL ES context. For further
-details, refer to the \l{Hello GL ES Example}.
+details, refer to the \l{OpenGL Window Example}.
*/