Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

2 files changed, 7 insertions, 2 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 2bc8a34..b72c67e 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1718,6 +1718,9 @@
     executable. If you need to install executable files, you can unset the
     files' executable flags.
 
+    Note that \c qmake will skip files that are executable. If you need to install
+    executable files, you can unset the files' executable flags.
+
     \target LEXIMPLS
     \section1 LEXIMPLS
 
@@ -1810,6 +1813,8 @@
 
     \bold{Note:} On the Symbian platform, this variable is ignored.
 
+    \bold{Note:} On the Symbian platform, this variable is ignored.
+
     \target MAKEFILE_GENERATOR
     \section1 MAKEFILE_GENERATOR
 
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 44b682a..65677be 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -751,8 +751,8 @@
 
     Tools for handling and visualizing test data are available as part of
     the \l {qtestlib-tools} project in the \l{Qt Labs} web site.
-	These include a tool for comparing performance data obtained from test
-	runs and a utility to generate Web-based graphs of performance data.
+    These include a tool for comparing performance data obtained from test
+    runs and a utility to generate Web-based graphs of performance data.
 
     See the \l{qtestlib-tools Announcement}{qtestlib-tools announcement}
     for more information on these tools and a simple graphing example.