Merge branch 'packaging-qtsdk' into release
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 3e669c2..b2e4eea 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -304,6 +304,11 @@
Generated files are modified on subsequent cmake runs only if their content
is changed.
+Note also that ``file(GENERATE)`` does not create the output file until the
+generation phase. The output file will not yet have been written when the
+``file(GENERATE)`` command returns, it is written only after processing all
+of a project's ``CMakeLists.txt`` files.
+
------------------------------------------------------------------------------
::
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 063aea1..37e50d2 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -263,8 +263,10 @@
052f86c15bbde68af55c7f7b340ab639 file2.txt
``remove [-f] <file>...``
- Remove the file(s), use ``-f`` to force it. If a file does
- not exist it will be silently ignored.
+ Remove the file(s). If any of the listed files already do not
+ exist, the command returns a non-zero exit code, but no message
+ is logged. The ``-f`` option changes the behavior to return a
+ zero exit code (i.e. success) in such situations instead.
``remove_directory <dir>``
Remove a directory and its contents. If a directory does
diff --git a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
index d30a2f2..a0811bc 100644
--- a/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
+++ b/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
@@ -5,3 +5,7 @@
This command will be added as a prefix to :command:`add_test`,
:command:`add_custom_command`, and :command:`add_custom_target` commands
for built target system executables.
+
+This property is initialized by the value of the
+:variable:`CMAKE_CROSSCOMPILING_EMULATOR` variable if it is set when a target
+is created.
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index d30d35f..bc906e5 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -423,7 +423,7 @@
list(APPEND wxWidgets_LIBRARIES opengl32 glu32)
endif()
- list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
+ list(APPEND wxWidgets_LIBRARIES winmm comctl32 oleacc rpcrt4 shlwapi version wsock32)
endmacro()
#-------------------------------------------------------------------
