From 2c39ede6b0efdb3b8dfbd6812ce1e013ba310eac Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 26 Feb 2013 14:00:30 +0100 Subject: Use qmake for package dependency resolution in cmake tests. This allows us to remove hardcoded depends information. Change-Id: I91150ae89b230ebbbcfc9706b70ea135149af0c7 Reviewed-by: Oswald Buddenhagen --- tests/auto/cmake/CMakeLists.txt | 2 -- tests/auto/cmake/cmake.pro | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.1 From 3792f777185544a6b89687a96d3c17a81e34b7a6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 26 Feb 2013 13:31:30 +0100 Subject: define MODULE_VERSION Task-number: QTBUG-29838 Change-Id: If7a85b5bf9701b1f804091b645b7de6554d4a27d Reviewed-by: Thiago Macieira --- .qmake.conf | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.1 From b5a32f91f343c2ea905c1af72cb99a854ce81ff0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 21 Feb 2013 12:00:58 +0100 Subject: Enable Active-X plugin in Qt Designer. Task-number: QTBUG-29733 Change-Id: I290c476d1ba84ca6ff519aa9d437d28e4ea066d8 Reviewed-by: Tim Jenssen --- src/designer/src/plugins/plugins.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1 From 24f92f79e5d1198e79f4d46489af35999e8e74cf Mon Sep 17 00:00:00 2001 From: Leonard Lee Date: Fri, 8 Mar 2013 14:33:34 +0100 Subject: List supported file formats in search indexing. The supported file formats is implemented in QHelpSearchIndexWriter::indexableFiles() function. Task-number: QTBUG-30110 Change-Id: I4b68d765da6769b52b74f7fa4fbc1a1bcbfd4e08 Reviewed-by: Leena Miettinen Reviewed-by: Jerome Pasion --- src/assistant/assistant/doc/src/assistant-manual.qdoc | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit v1.2.1 From 251b76ad92f4bd5d145b37ad0c5a71db279b0e7c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 12 Mar 2013 11:06:20 +0100 Subject: Install the Qt5LinguistToolsConfigVersion.cmake file. Change-Id: I8f14f79c1e8e17816d63303f130773780547346a Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- src/linguist/linguist.pro | 2 +- tests/auto/cmake/test_translation_macros/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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} -- cgit v1.2.1