Merge remote-tracking branch 'origin/5.7' into 5.8

cf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a and 3aaa5d6b32130d3eeac872a59a5a44bfb20dfd4a
were reverted because of reconstruction in 5.7.

defineTest(qtConfTest_checkCompiler) in configure.pri is smart
enough to cover the case in a9474d1260a8c8cc9eae14f2984098919d9684e5.

DirectWrite: Fix advances being scaled to 0

Since 131eee5cd, the stretch of a font can be 0, meaning
"whatever the font provides". In combination with ec7fee96,
this would cause advances in the DirectWrite engine to be scaled to
0, causing the QRawFont test to fail.

Conflicts:
	configure
	mkspecs/features/uikit/device_destinations.sh
	mkspecs/features/uikit/xcodebuild.mk
	src/corelib/global/qglobal.cpp
	src/corelib/global/qnamespace.qdoc
	src/plugins/platforms/cocoa/qcocoamenuitem.h
	src/plugins/platforms/windows/qwindowsservices.cpp
	src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
	src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
	src/widgets/kernel/qapplication.cpp
	tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
	tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp

Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e

2 files changed, 8 insertions, 78 deletions

diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
index 33bda07ebe..1f372faded 100644
--- a/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
+++ b/src/testlib/doc/snippets/code/doc_src_qtestlib.qdoc
@@ -73,12 +73,6 @@ cetest [options] ...
 //! [6]
 
 
-//! [7]
-set INCLUDE=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Inc;%INCLUDE%
-set LIB=C:\Program Files\Windows CE Tools\wce500\Windows Mobile 5.0 Pocket PC SDK\Activesync\Lib;%LIB%
-//! [7]
-
-
 //! [9]
 /myTestDirectory$ qmake -project "QT += testlib"
 /myTestDirectory$ qmake
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index a420ec4761..d775ae5b76 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -349,82 +349,18 @@
     counters can be obtained by running any benchmark executable with the
     option \c -perfcounterlist.
 
-    Note that using the performance counter may require enabling access to non-privileged applications.
-
-    \note Depending on the device configuration, tick counters on the
-     Windows CE platform may not be as fine-grained, compared to other platforms.
-     Devices that do not support high-resolution timers default to
-     one-millisecond granularity.
-
-    See \l {Chapter 5: Writing a Benchmark}{Writing a Benchmark} in the Qt Test
-    Tutorial for more benchmarking examples.
-
-    \section1 Using Qt Test Remotely on Windows CE
-
-    The \c cetest convenience application enables you to launch an
-    application remotely on a Windows CE device or emulator.
-
-    It needs to be executed after the unit test has been successfully compiled.
-
-    Prior to launching, the following files are copied to the device:
-
     \list
-    \li all Qt libraries the project links to
-    \li \l {QtRemote}{QtRemote.dll}
-    \li the c runtime library specified during installation
-    \li all files specified in the \c .pro file following the \l DEPLOYMENT rules.
-    \endlist
-
-    \section2 Syntax
-    The syntax to execute an autotest takes the following simple form:
-
-    \snippet code/doc_src_qtestlib.qdoc 6
-
-    \section2 Options
-    \c cetest provides the same options as those for unit-testing on non cross-compiled
-    platforms. See \l {Qt Test Command Line Arguments} {Command Line Arguments} for
-    more information.
-
-    The following commands are also included:
-
+    \li \b Notes:
     \list
-    \li \c -debug \br
-    Compiles the test version in debug mode.
-    \li \c -release \br
-    Compiles the test version in release mode.
-    \li \c -libpath \e path \br
-    Copies Qt libraries to the specified path.
-    \li \c -qt-delete \br
-    Deletes Qt libraries after execution.
-    \li \c -project-delete \br
-    Deletes project files after execution.
-    \li \c -delete \br
-    Deletes project and Qt libraries after execution.
-    \li \c -conf \br
-    Specifies a qt.conf file to be deployed to remote directory.
+    \li Using the performance counter may require enabling access to non-privileged
+        applications.
+    \li Devices that do not support high-resolution timers default to
+        one-millisecond granularity.
+    \endlist
     \endlist
 
-    \note \c{debug} is the default build option.
-
-    \section2 QtRemote
-    \c QtRemote is a small library which is built after Qt Test. It allows the host
-    system to create a process on a remote device and waits until its execution has
-    been finished.
-
-    \section2 Requirements
-    \c cetest uses Microsoft ActiveSync to establish a remote connection between the
-    host computer and the device. Thus header files and libraries are needed to compile
-    cetest and QtRemote successfully.
-
-    Prior to \l{Installing Qt for Windows CE}{installation} of Qt, you need to set your
-    \c INCLUDE and \c LIB environment variables properly.
-
-    A default installation of Windows Mobile 5 for Pocket PC can be obtained by:
-
-    \snippet code/doc_src_qtestlib.qdoc 7
-
-    Note that Qt will remember the path, so you do not need to set it again
-    after switching the environments for cross-compilation.
+    See \l {Chapter 5: Writing a Benchmark}{Writing a Benchmark} in the Qt Test
+    Tutorial for more benchmarking examples.
 
     \section1 3rd Party Code