summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-10-17 15:54:34 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-10-17 14:05:38 +0000
commit76c602dec5e6bd16b9c62d346d9b19037b94c199 (patch)
tree7cb090c41682f5d4fa855131498f6d3b6c32ccf8
parentcaa289c5f7ddd9fb2dc0a796ad3e106b2852ce4e (diff)
downloadqtdoc-76c602dec5e6bd16b9c62d346d9b19037b94c199.tar.gz
Use the check mark image, ok.png, in tables
Change-Id: I1869285e53751a3a9ff2bf78219774f6ed4e9ef1 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
-rw-r--r--doc/images/ok.pngbin0 -> 652 bytes
-rw-r--r--doc/src/userinterfaces.qdoc44
2 files changed, 22 insertions, 22 deletions
diff --git a/doc/images/ok.png b/doc/images/ok.png
new file mode 100644
index 00000000..8f63851a
--- /dev/null
+++ b/doc/images/ok.png
Binary files differ
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 040dd311..9f26eafa 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -149,32 +149,32 @@ choose the best suited tool for the job.
\li
\row
\li Native look'n'feel
- \li X
- \li X
+ \li \inlineimage ok
+ \li \inlineimage ok
\li
\li Qt Widgets and Qt Quick Controls integrate well to the underlying
platform, providing a native look'n'feel on Windows, Linux, and OS X.
\row
\li Custom look'n'feel
- \li X
- \li (X)
- \li (X)
+ \li \inlineimage ok
+ \li \inlineimage ok
+ \li \inlineimage ok
\li Qt Widgets provide means for customization via style sheets,
but Qt Quick is a better performing choice for user interfaces
that do not aim to look native.
\row
\li Fluid animated UIs
- \li X
+ \li \inlineimage ok
\li
- \li X
+ \li \inlineimage ok
\li Qt Widgets do not scale well for animations. Qt Quick
offers a convenient and natural way to implement animations in a
declarative manner.
\row
\li Touch screen
- \li X
+ \li \inlineimage ok
\li
- \li X
+ \li \inlineimage ok
\li Qt Widgets often require a mouse cursor for good interaction, whereas
Qt Quick only provides primitive building blocks that were designed
with touch interaction in mind.
@@ -183,7 +183,7 @@ choose the best suited tool for the job.
\row
\li Standard industry widgets
\li
- \li X
+ \li \inlineimage ok
\li
\li Qt Widgets provide all the bells and whistles, developed over two
decades, needed for building standard industry type applications.
@@ -191,38 +191,38 @@ choose the best suited tool for the job.
and interact with web content.
\row
\li Model/View programming
- \li (X)
- \li X
+ \li \inlineimage ok
+ \li \inlineimage ok
\li
\li Qt Quick provides convenient views, but Qt Widgets provide more
convenient and complete framework. In addition to Qt Quick views,
Qt Quick Controls provide a TableView.
\row
\li Rapid UI development
- \li X
- \li (X)
- \li (X)
+ \li \inlineimage ok
+ \li \inlineimage ok
+ \li \inlineimage ok
\li Qt Quick is an excellent choice for rapid UI prototyping and development.
\row
\li HW accelerated graphics
- \li X
- \li (X)
- \li X
+ \li \inlineimage ok
+ \li \inlineimage ok
+ \li \inlineimage ok
\li Qt Widgets provide QGLWidget for rendering OpenGL graphics,
and Qt WebEngine supports WebGL, but the OpenGL ES 2.0 or OpenGL 2.0
based \l {Qt Quick Scene Graph} has proven to provide the best
performance for UIs and for integrating with OpenGL content.
\row
\li Graphical effects
- \li X
+ \li \inlineimage ok
\li
\li
\li The particle system and shader effects available in Qt Quick
are more flexible. Qt Widgets offer very little in this area.
\row
\li Rich text processing
- \li (X)
- \li X
+ \li \inlineimage ok
+ \li \inlineimage ok
\li
\li Qt Widgets currently provide the most comprehensive base for implementing
text editors. Qt's rich text document classes can also be utilized in
@@ -232,7 +232,7 @@ choose the best suited tool for the job.
\li Existing web content
\li
\li
- \li X
+ \li \inlineimage ok
\li Both Qt Quick and Qt Widgets provide components for presenting
\l {richtext-html-subset.html}{simple rich text}, but Qt WebEngine
is the right choice for presenting full-blown web content.