11 files changed, 17 insertions, 42 deletions
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/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index 72110dffd..f37af3134 100644
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -35,8 +35,6 @@ include(../tabordereditor/tabordereditor.pri)
 
 PRECOMPILED_HEADER= lib_pch.h
 
-include(../../sharedcomponents.pri)
-
 # MinGW GCC cc1plus crashes when using precompiled header
 # Date Checked: 3rd September 2012
 #
diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 6eb07fddd..75d6f0826 100644
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -79,6 +79,4 @@ mac {
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
 
-include(../sharedcomponents.pri)
-
 unix:!mac:LIBS += -lm
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index b93bd5d7b..4ae41fe8c 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -19,5 +19,3 @@ include(sdk/sdk.pri)
 include(shared/shared.pri)
 include(uilib/uilib.pri)
 PRECOMPILED_HEADER=lib_pch.h
-
-include(../sharedcomponents.pri)
diff --git a/src/designer/src/sharedcomponents.pri b/src/designer/src/sharedcomponents.pri
deleted file mode 100644
index 8945138d6..000000000
--- a/src/designer/src/sharedcomponents.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
-
-for(QTSHAREDLIB, $$list($$unique(LIBS))) {
-    QT_SHARED_LIB_NAME =
-         isEqual(QTSHAREDLIB, -lformeditor):QT_SHARED_LIB_NAME = formeditor
-    else:isEqual(QTSHAREDLIB, -lobjectinspector):QT_SHARED_LIB_NAME = objectinspector
-    else:isEqual(QTSHAREDLIB, -lpropertyeditor):QT_SHARED_LIB_NAME = propertyeditor
-    else:isEqual(QTSHAREDLIB, -lwidgetbox):QT_SHARED_LIB_NAME = widgetbox
-    else:isEqual(QTSHAREDLIB, -lsignalsloteditor):QT_SHARED_LIB_NAME = signalsloteditor
-    else:isEqual(QTSHAREDLIB, -ltabordereditor):QT_SHARED_LIB_NAME = tabordereditor
-    else:isEqual(QTSHAREDLIB, -lresourceeditor):QT_SHARED_LIB_NAME = resourceeditor
-    else:isEqual(QTSHAREDLIB, -lbuddyeditor):QT_SHARED_LIB_NAME = buddyeditor
-    else:isEqual(QTSHAREDLIB, -ltaskmenu):QT_SHARED_LIB_NAME = taskmenu
-    else:isEqual(QTSHAREDLIB, -lQtDesigner):QT_SHARED_LIB_NAME = QtDesigner
-    else:isEqual(QTSHAREDLIB, -lQtDesignerComponents):QT_SHARED_LIB_NAME = QtDesignerComponents
-    else:isEqual(QTSHAREDLIB, -lQtOpenGL):QT_SHARED_LIB_NAME = QtOpenGL
-
-    !isEmpty(QT_SHARED_LIB_NAME) {
-        LIBS -= -l$${QT_SHARED_LIB_NAME}
-        qtAddLibrary($$QT_SHARED_LIB_NAME)
-    }
-}
diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro
index e526aa54a..db9e3f5ab 100644
--- a/src/designer/src/uitools/uitools.pro
+++ b/src/designer/src/uitools/uitools.pro
@@ -14,5 +14,3 @@ DEFINES += \
     QT_DESIGNER_STATIC
 
 include(../lib/uilib/uilib.pri)
-
-include(../sharedcomponents.pri)
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/sync.profile b/sync.profile
index dca74a4ff..ac500e117 100644
--- a/sync.profile
+++ b/sync.profile
@@ -16,10 +16,10 @@
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/release",
-    "qtxmlpatterns" => "refs/heads/release",
-    "qtdeclarative" => "refs/heads/release",
-    "qtjsbackend" => "refs/heads/release",
-    "qtactiveqt" => "refs/heads/release",
-    "qtwebkit" => "refs/heads/release",
+    "qtbase" => "refs/heads/old/5.0",
+    "qtxmlpatterns" => "refs/heads/old/5.0",
+    "qtdeclarative" => "refs/heads/old/5.0",
+    "qtjsbackend" => "refs/heads/old/5.0",
+    "qtactiveqt" => "refs/heads/old/5.0",
+    "qtwebkit" => "refs/heads/old/5.0",
 );
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..86aa9c3ca 100644
--- a/tests/auto/cmake/cmake.pro
+++ b/tests/auto/cmake/cmake.pro
@@ -2,4 +2,8 @@
 # Cause make to do nothing.
 TEMPLATE = subdirs
 
-CONFIG += ctest_testcase
+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}