summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-01-08 12:57:42 +0100
committerTopi Reiniƶ <topi.reinio@digia.com>2015-01-14 10:39:45 +0200
commita3e46201dff25be72232e74fa43030321edf61d0 (patch)
treefd62b800e662a4f076cc9b8579e3939451638372
parent480d4e3972f0c6916fb76544bf770423c73b02a3 (diff)
Doc: Fix various issues
- Update privacy policy URL - Remove unnecessary \targets - Ensure Qt Quick and Qt Graphical Effects modules are linked to correctly Change-Id: I45cbf60ad07db1a74c250f0192ea8c674513f696 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--src/doc/config/qtquick2drenderer.qdocconf2
-rw-r--r--src/doc/src/qtquick2drenderer-index.qdoc2
-rw-r--r--src/doc/src/qtquick2drenderer-installation-guide.qdoc2
-rw-r--r--src/doc/src/qtquick2drenderer-limitations.qdoc14
4 files changed, 9 insertions, 11 deletions
diff --git a/src/doc/config/qtquick2drenderer.qdocconf b/src/doc/config/qtquick2drenderer.qdocconf
index e2f2e938f8..79476749d1 100644
--- a/src/doc/config/qtquick2drenderer.qdocconf
+++ b/src/doc/config/qtquick2drenderer.qdocconf
@@ -22,7 +22,7 @@ HTML.footer = \
" Digia, Qt and their respective logos are trademarks of Digia Plc \n" \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. <a title=\"Privacy Policy\"\n" \
- " href=\"http://qt.digia.com/Digia-Legal-Notice--Privacy-Policy/\">Privacy Policy</a></p>\n" \
+ " href=\"http://www.qt.io/terms-conditions/#section-3\">Privacy Policy</a></p>\n" \
"</div>\n"
naturallanguate = en_US
diff --git a/src/doc/src/qtquick2drenderer-index.qdoc b/src/doc/src/qtquick2drenderer-index.qdoc
index b1c145f20e..2edf181b82 100644
--- a/src/doc/src/qtquick2drenderer-index.qdoc
+++ b/src/doc/src/qtquick2drenderer-index.qdoc
@@ -23,7 +23,7 @@
\nextpage qtquick2drenderer-installation-guide.html
\title Qt Quick 2D Renderer
- \RENDERER is an alternative renderer for Qt Quick 2 that uses the Raster
+ \RENDERER is an alternative renderer for \l {Qt Quick} 2 that uses the Raster
paint engine to render the contents of the scene graph instead of OpenGL.
As a result of not using OpenGL to render the scene graph, some features
and optimizations are no longer available. Most Qt Quick 2 applications
diff --git a/src/doc/src/qtquick2drenderer-installation-guide.qdoc b/src/doc/src/qtquick2drenderer-installation-guide.qdoc
index 1aff29eda2..4ebe579677 100644
--- a/src/doc/src/qtquick2drenderer-installation-guide.qdoc
+++ b/src/doc/src/qtquick2drenderer-installation-guide.qdoc
@@ -24,7 +24,7 @@
\title Installation Guide
- The building of \RENDERER is complicated by the fact that Qt Quick 2
+ The building of \RENDERER is complicated by the fact that \l{Qt Quick} 2
always requires OpenGL support regardless of whether it is being used or
not. You will need to build Qt with support for OpenGL even if the target
system does not support it. If you have a Qt build that already supports
diff --git a/src/doc/src/qtquick2drenderer-limitations.qdoc b/src/doc/src/qtquick2drenderer-limitations.qdoc
index 3b1c84ce47..42cdd425d3 100644
--- a/src/doc/src/qtquick2drenderer-limitations.qdoc
+++ b/src/doc/src/qtquick2drenderer-limitations.qdoc
@@ -24,7 +24,7 @@
\title Limitations
- Qt Quick 2 was designed to take full advantage of OpenGL to make the most
+ \l {Qt Quick} 2 was designed to take full advantage of OpenGL to make the most
out of available graphics hardware. By not relying on OpenGL, \RENDERER
presents certain limitations regarding the available features.
@@ -35,8 +35,8 @@
ShaderEffect components in QtQuick 2 can not be rendered with \RENDERER.
\section1 Qt Graphical Effects Module
- QtGraphicalEffects uses ShaderEffect items to render effects. If you use a
- graphical effect from QtGraphicalEffects, then you should not hide the source
+ \l {Qt Graphical Effects} uses ShaderEffect items to render effects. If you use
+ graphical effects from this module, then you should not hide the source
item so that the original item can still be rendered.
\section1 Particle Effects
@@ -44,16 +44,14 @@
possible, remove particles completely from the scene. Otherwise they will still
require some processing, even though they are not visible with \RENDERER.
- \target Sprites
\section1 Sprites
The Sprite item depends on inaccessible OpenGL functions and will
not be visible.
- \target Text
- \section1 Text
+ \section1 Rendering Text
The text rendering with \RENDERER is based on software rasterization and does
not respond as well to transformations such as scaling as when using OpenGL.
- The quality is similar to choosing \c Text.NativeRendering with QtQuick.Text
- items.
+ The quality is similar to choosing \l {QtQuick::Text::renderType}
+ {Text.NativeRendering} with \l {QtQuick::}{Text} items.
*/