Merge 1.12 into master

Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc

2 files changed, 11 insertions, 10 deletions

diff --git a/doc/appendix/qbs-porting.qdoc b/doc/appendix/qbs-porting.qdoc
index ffe935ad9..e17d7b0ac 100644
--- a/doc/appendix/qbs-porting.qdoc
+++ b/doc/appendix/qbs-porting.qdoc
@@ -144,15 +144,16 @@
     }
     \endcode
 
-    \section2 HEADERS, SOURCES, FORMS, RESOURCES
+    \section2 HEADERS, SOURCES, FORMS, RESOURCES, OTHER_FILES
 
-    Include header, source, form, and resource files as values of
-    \l{Product::files}{Product.files} property:
+    Include header, source, form, and resource files as well as any
+    other files as values of a \l{Product::files}{Product.files}
+    or \l{Group::files}{Group.files}  property:
 
     \code
     QtApplication {
         name: "myapp"
-        files: ["myapp.h", "myapp.cpp", "myapp.ui", "myapp.qrc"]
+        files: ["myapp.h", "myapp.cpp", "myapp.ui", "myapp.qrc", "readme.txt"]
     }
     \endcode
 
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