summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-08-20 13:43:11 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-08-20 11:58:18 +0000
commit3336baad129e6496f809b9a26fc258df53837109 (patch)
treef40d8eaf3fc71332cda5eadd71c2a974cf5506cb
parent028d4b54aa1de8e3e3aab0b37014b259030481a4 (diff)
downloadqt-creator-3336baad129e6496f809b9a26fc258df53837109.tar.gz
Fix references to the clang code model documentation file
Was forgotten in 7ab07a4e8f. Change-Id: I2c6d21b79658e3946eb6ecdcf7b11992c0bf865e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--README.md2
-rw-r--r--qbs/modules/libclang/libclang.qbs3
-rw-r--r--src/plugins/clangcodemodel/README2
-rw-r--r--src/plugins/clangcodemodel/clangcodemodel.pro2
-rw-r--r--src/plugins/clangcodemodel/clangcodemodel.qbs2
5 files changed, 6 insertions, 5 deletions
diff --git a/README.md b/README.md
index 0e63faee54..7306a91cb6 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ For detailed information on the supported compilers, see
the location of libclang.dll/.so that you want to be used.
See more info in the section "Prebuilt LLVM/Clang packages".
* When you launch Qt Creator, activate the Clang Code Model plugin as
- described in doc/src/editors/creator-clang-codemodel.qdoc.
+ described in doc/src/editors/creator-only/creator-clang-codemodel.qdoc.
11. You are now ready to configure and build Qt and Qt Creator.
Please see <https://wiki.qt.io/Building_Qt_5_from_Git> for
diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs
index b13ba888ff..435b8b786a 100644
--- a/qbs/modules/libclang/libclang.qbs
+++ b/qbs/modules/libclang/libclang.qbs
@@ -61,7 +61,8 @@ Module {
if (!clangProbe.found) {
console.warn("No usable libclang version found."
+ " Set LLVM_INSTALL_DIR to build the Clang Code Model."
- + " For details, see doc/src/editors/creator-clang-codemodel.qdoc.");
+ + " For details, see"
+ + " doc/src/editors/creator-only/creator-clang-codemodel.qdoc.");
throw new Error();
}
}
diff --git a/src/plugins/clangcodemodel/README b/src/plugins/clangcodemodel/README
index 84e2a30d8e..334c70580a 100644
--- a/src/plugins/clangcodemodel/README
+++ b/src/plugins/clangcodemodel/README
@@ -1 +1 @@
-See ../../../doc/src/editors/creator-clang-codemodel.qdoc
+See ../../../doc/src/editors/creator-only/creator-clang-codemodel.qdoc
diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index fd64057eff..aba8a8ee7f 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -85,7 +85,7 @@ FORMS += clangprojectsettingswidget.ui
DISTFILES += \
README \
- $${IDE_SOURCE_TREE}/doc/src/editors/creator-clang-codemodel.qdoc
+ $${IDE_SOURCE_TREE}/doc/src/editors/creator-only/creator-clang-codemodel.qdoc
equals(TEST, 1) {
HEADERS += \
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index 20e0cb269d..fe4721c81e 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -126,7 +126,7 @@ QtcPlugin {
fileTags: []
files: [
"README",
- project.ide_source_tree + "/doc/src/editors/creator-clang-codemodel.qdoc",
+ project.ide_source_tree + "/doc/src/editors/creator-only/creator-clang-codemodel.qdoc",
]
}
}