aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-10-12 13:17:46 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-10-12 13:17:46 +0200
commit6f3e1896fa567bca8a9f3d35ea26cae518a9313e (patch)
tree7475ec4153bece275efc1a97d5fa7420aa07a880 /doc/reference
parentec709675476e507ea094348091b0475084de976e (diff)
parentfa5e42f915211637da0d6461c9764962ee47f923 (diff)
Merge 1.12 into master
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/modules/android-ndk-module.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/reference/modules/android-ndk-module.qdoc b/doc/reference/modules/android-ndk-module.qdoc
index 08f54a9c9..8113a7c68 100644
--- a/doc/reference/modules/android-ndk-module.qdoc
+++ b/doc/reference/modules/android-ndk-module.qdoc
@@ -86,12 +86,12 @@
\list
\li \c "c++_shared"
\li \c "c++_static"
- \li \c "gabi++_shared"
- \li \c "gabi++_static"
- \li \c "gnustl_shared"
- \li \c "gnustl_static"
- \li \c "stlport_shared"
- \li \c "stlport_static"
+ \li \c "gabi++_shared" (until r17)
+ \li \c "gabi++_static" (until r17)
+ \li \c "gnustl_shared" (until r17)
+ \li \c "gnustl_static" (until r17)
+ \li \c "stlport_shared" (until r17)
+ \li \c "stlport_static" (until r17)
\li \c "system"
\endlist