Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879

7 files changed, 11 insertions, 6 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5de255cb6..02554aba2 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.0.2
diff --git a/src/assistant/assistant/doc/src/assistant-manual.qdoc b/src/assistant/assistant/doc/src/assistant-manual.qdoc
index aa426ee2f..35a31840f 100644
--- a/src/assistant/assistant/doc/src/assistant-manual.qdoc
+++ b/src/assistant/assistant/doc/src/assistant-manual.qdoc
@@ -461,6 +461,9 @@
     exit right away displaying a message if the registration was successful
     or not.
 
+    The search indexing will only index your custom *.html, *.htm,
+    and *.txt files.
+
     \snippet doc_src_assistant-manual.qdoc 6
 
     The \c{-quiet} flag can be passed on to \QA to prevent it from writing
diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 7cd16f2da..22de8c957 100644
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -3,4 +3,4 @@ CONFIG += ordered
 
 # qtHaveModule(opengl): SUBDIRS += tools/view3d
 qtHaveModule(webkitwidgets): SUBDIRS += qwebview
-# win32: qtHaveModule(activeqt): SUBDIRS += activeqt
+win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index 04b0ab648..334aa1ad8 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -38,7 +38,7 @@ cmake_linguist_macros_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistToo
 cmake_linguist_macros_file.CONFIG = verbatim
 QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file
 
-cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_macros_file.output
+cmake_linguist_tools_files.files += $$cmake_linguist_config_file.output $$cmake_linguist_config_version_file.output $$cmake_linguist_macros_file.output
 cmake_linguist_tools_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5LinguistTools
 cmake_linguist_tools_files.CONFIG = no_check_exists
 INSTALLS += cmake_linguist_tools_files
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 23ba602c1..e55749230 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -35,8 +35,6 @@ endif()
 
 find_package(Qt5Widgets)
 if (Qt5Widgets_FOUND)
-    set(Qt5_MODULE_TEST_DEPENDS Xml Widgets)
-
     test_module_includes(
       Designer QFormBuilder
       Help QHelpSearchQuery
diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro
index bf2dbcb77..db06747ed 100644
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -2,4 +2,6 @@
 # Cause make to do nothing.
 TEMPLATE = subdirs
 
+qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST = designer help uitools
+
 CONFIG += ctest_testcase
diff --git a/tests/auto/cmake/test_translation_macros/CMakeLists.txt b/tests/auto/cmake/test_translation_macros/CMakeLists.txt
index f620059c3..14ecb40e3 100644
--- a/tests/auto/cmake/test_translation_macros/CMakeLists.txt
+++ b/tests/auto/cmake/test_translation_macros/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project(test_translation_macros)
 
-find_package(Qt5Core REQUIRED)
-find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Core 5.0.0 REQUIRED)
+find_package(Qt5LinguistTools 5.0.0 REQUIRED)
 
 include_directories(
   ${Qt5Core_INCLUDE_DIRS}