summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-09-21 12:19:48 +0200
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-09-28 08:59:04 +0000
commit3ef6d7f320876d0dc25d34dc74593b0eba1eadc6 (patch)
tree6149e512448d6b787b819ff921096e60997a2387
parentab706a089b48eb17c45239fb61eb5f2a47ad6cb0 (diff)
downloadqtdoc-3ef6d7f320876d0dc25d34dc74593b0eba1eadc6.tar.gz
Doc: Added the missing references to some of the Qt features
Change-Id: I01b472930bfeed75fd7532a5fa2d8daaaf3002a5 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
-rw-r--r--doc/src/developmenttools.qdoc7
-rw-r--r--doc/src/external-resources.qdoc4
-rw-r--r--doc/src/graphics.qdoc6
-rw-r--r--doc/src/mobile.qdoc11
-rw-r--r--doc/src/platforms/emb-linux.qdoc8
-rw-r--r--doc/src/userinterfaces.qdoc10
6 files changed, 40 insertions, 6 deletions
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index 829c809e..601da74f 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -93,6 +93,11 @@
\row \li \l{D-Bus Viewer}
\li A tool to introspect D-Bus objects and messages. Available from
the Qt SDK or the Qt 5 qttools repository.
+ \row \li \l{Qt Quick Compiler}
+ \li A compiler for QML that enables building Qt Quick applications
+ without having to deploy the QML sources on to the target.
+ \row \li \l{Qt Visual Studio Add-in}
+ \li Intended for developers who wish to develop Qt applications using
+ the Visual Studio IDE instead of Qt Creator.
\endtable
-
*/
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 387980e7..98faf688 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -276,3 +276,7 @@
\externalpage http://doc.qt.io/vs-addin
\title Qt Visual Studio Add-in
*/
+/*!
+ \externalpage http://doc.qt.io/emulator/index.html
+ \title Emulator
+*/
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index ce958b90..3f6de2c5 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -169,7 +169,9 @@ Qt Quick scene graph is rendered, respectively. There signals are
emitted from the render thread (when applicable), and the connections
need to be direct.
-
+Qt Quick can also be rendered using \l{Qt Quick 2D Renderer}. This raster
+paint engine enables rendering Qt Quick applications on platforms that
+do not have OpenGL.
\section1 Printing
@@ -177,8 +179,6 @@ Qt supports printing both directly to actual printers, locally or on the
network, as well as producing PDF output. How to do printing with
Qt is described in detail on the \l {Qt Print Support} page.
-
-
\section1 Images
Qt supports convenient reading, writing, and manipulating of images through the
diff --git a/doc/src/mobile.qdoc b/doc/src/mobile.qdoc
index 26cc79a3..8bc2bafd 100644
--- a/doc/src/mobile.qdoc
+++ b/doc/src/mobile.qdoc
@@ -96,4 +96,15 @@
\li \l{Qt NFC}
\endlist
+ \section1 In-App Purchasing
+
+ The Qt Purchasing module enables mobile developers to generate revenue from
+ their applications on Android and iOS platforms. The module provides C++ and
+ QML alternatives to support the In-App purchasing use case in Qt
+ applications.
+
+ \list
+ \li \l{Qt Purchasing}
+ \endlist
+
*/
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 7df9e318..1a2dd660 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -568,4 +568,12 @@
the \l{http://wayland.freedesktop.org/}{Weston} reference compositor.
Refer to the \l{https://wiki.qt.io/WestonTouchScreenIssues}{Qt Wiki} for
further information.
+
+ \section1 Related Topics
+
+ \list
+ \li \l{Qt for Device Creation}
+ \li \l Emulator
+ \li \l{Qt Virtual Keyboard}
+ \endlist
*/
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 0e98380e..228eba8a 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -28,7 +28,7 @@
/*!
\page topics-ui.html
\title User Interfaces
-\brief Qt's features for creating user interfaces
+\brief Qt's features for Creating User Interfaces
Qt features multiple technologies for creating user interfaces. While it is
possible to mix and match these different technologies as needed, one approach
@@ -104,8 +104,14 @@ type applications.
\li \l{Internationalization with Qt}{Internationalization}
\endlist
-\section1 Displaying Web Content
+\section1 Visualizing Data
+
+Qt provides ready-made C++ classes and QML types for visualizing data in the
+form of charts and graphs, which are known to be best ways of analyzing data.
+\l{Qt Charts} and \{Qt Data Visualization} are the two Qt add-ons that make
+data visualization using 2D and 3D models a reality.
+\section1 Displaying Web Content
Qt provides both \l{http://www.webkit.org/}{WebKit}-based and Chromium-based
(\l{Qt WebEngine}{WebEngine}) layout engines, which enable you to embed web content