diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:25 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:25:25 +0100 |
| commit | ea98b4694c7a0674293e71cb20c15c3607cfb258 (patch) | |
| tree | b3ad5b2898c579af1f583556fbb87a17f9f71db0 /src | |
| parent | 4bddc101ea7bace61397f44a0f7e9a9f92c92f09 (diff) | |
| parent | 8b76d788604ff4e89198813c542e6bb440b202fb (diff) | |
| download | qttools-ea98b4694c7a0674293e71cb20c15c3607cfb258.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
Diffstat (limited to 'src')
| -rw-r--r-- | src/assistant/assistant/doc/src/assistant-manual.qdoc | 3 | ||||
| -rw-r--r-- | src/designer/src/plugins/plugins.pro | 2 | ||||
| -rw-r--r-- | src/linguist/linguist.pro | 2 |
3 files changed, 5 insertions, 2 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/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 |