aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 12:55:29 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2016-11-28 08:20:12 +0100
commit661bba4f11666d5d9018a6a1d16a71c324bdf123 (patch)
treeb4abcb5acf9ce2efd6f39b90ab176eedcce978c3 /src/imports/controls/doc
parent52d042e8a0324dbb05fb4f46fb9ea774ec168697 (diff)
parent6aa97038e26bab96455b2fc3febc5d358a5e7599 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts: src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc sync.profile Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
Diffstat (limited to 'src/imports/controls/doc')
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index 330bee89..01429b94 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -109,20 +109,20 @@
\li Yes
\li No
\row
- \li Runtime style changes
- \li Yes
- \li Yes
+ \li Runtime style/theme changes
+ \li Yes \sup 1
+ \li Yes \sup 2
\row
\li Can be used on Desktop
\li Yes
\li Yes
\row
\li Can be used on Mobile
- \li Yes
+ \li Yes \sup 3
\li Yes
\row
\li Can be used on Embedded
- \li Yes
+ \li Yes \sup 3
\li Yes
\row
\li Internal event handling
@@ -130,6 +130,12 @@
\li C++
\endtable
+ \list 1
+ \li Not officially supported, but technically possible via private APIs
+ \li Only themes for specific styles can be changed at runtime, styles are fixed
+ \li Performance may not be optimal
+ \endlist
+
\section2 Porting Qt Quick Controls Code
The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, but it