summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-12-02 15:49:06 +0100
committerKai Koehne <kai.koehne@qt.io>2017-02-06 14:20:02 +0000
commit7672f92440e7ba5587583acf8f54128a203f9acc (patch)
tree6fd046e6bc2463374145f8ec00149d113911c211
parentd7e99cc6aac12d80f9233fecb91683b4dad74cb1 (diff)
downloadqtdoc-7672f92440e7ba5587583acf8f54128a203f9acc.tar.gz
Move 'Native Syle for Android' to Qt GUI
The code is in qtbase, and used AFAIK by the QPA plugin for Android. I don't think it's directly included by Qt Quick Controls. Change-Id: Id36a7bbaf7178c52cf5bc460739b009aa6084859 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--doc/src/legal/licenses.qdoc8
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index bf6e54d2..099680df 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -165,7 +165,8 @@
\li Allows users to transfer information between and within applications. \li BSD-style \li
\row \li \l{ANGLE (angle)}{ANGLE}
\li Opensource project to map OpenGL ES API calls to DirectX API. \li BSD-style \li \l {Qt for Windows}
- \row \li \li \li \li
+ \row \li \l {Native Style for Android} \li \li Apache License 2.0 \li \l {Qt for Android}
+
\row \li {1,4} Qt Location
@@ -209,11 +210,6 @@
\row \li \li \li \li
\row \li \li \li \li
- \row \li {1,4} Qt Quick Controls
- \row \li \l {Native Style for Android} \li \li Apache License 2.0 \li \l {Qt for Android}
- \row \li \li \li \li
- \row \li \li \li \li
-
\row \li {1,6} Qt Script
\li \li \li \li (Provided for Qt 4 compatibility)