From a6b34bd38b7cb75c8943bdc1b5e607f4a74761d8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 15 Dec 2016 15:14:31 +0100 Subject: [PATCH] ClangCodeModel: Make DisabledByDefault instead of Experimental Update documentation accordingly. Change-Id: I3309815ce23cfa8c941717883a7e0e312b7d9a5f Reviewed-by: Marco Bubke Reviewed-by: Nikolai Kosjar --- doc/src/editors/creator-clang-codemodel.qdoc | 6 +++--- doc/src/editors/creator-editors-writing-code.qdoc | 2 +- doc/src/projects/creator-projects-settings-overview.qdoc | 2 +- src/plugins/clangcodemodel/ClangCodeModel.json.in | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc index 6d8fbb1d92c..cdb7c2d2d1f 100644 --- a/doc/src/editors/creator-clang-codemodel.qdoc +++ b/doc/src/editors/creator-clang-codemodel.qdoc @@ -62,7 +62,7 @@ \endlist - \QC comes with an experimental plugin that provides some of these services + \QC comes with a plugin that provides some of these services for C++ on top of \l{http://clang.llvm.org/}{Clang}. \section1 About the Clang Code Model @@ -85,7 +85,7 @@ include several files, processing a single file and all the included files can take a while. - The following services are currently implemented in the experimental Clang + The following services are currently implemented in the Clang code model plugin: \list @@ -96,7 +96,7 @@ \endlist - To use the plugin, you must build it and configure it in \QC. + To use the plugin, you must activate it and configure it in \QC. \section1 Activating Clang Code Model diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc index b5098871e6f..fc358a9bd22 100644 --- a/doc/src/editors/creator-editors-writing-code.qdoc +++ b/doc/src/editors/creator-editors-writing-code.qdoc @@ -111,7 +111,7 @@ \li \l{Parsing C++ Files with the Clang Code Model} - An experimental Clang code model plugin enables you to replace the + A Clang code model plugin enables you to replace the built-in \QC code model with the Clang code model. Clang is a C language family front end for LLVM. Clang provides you with more accurate information than the built-in code model but can be slower diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index bc62575c598..b2bd9205a4a 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/doc/src/projects/creator-projects-settings-overview.qdoc @@ -98,7 +98,7 @@ \li \l{Specifying Dependencies}{Dependencies} \li \l{Parsing C++ Files with the Clang Code Model} - {Clang Code Model} (experimental) + {Clang Code Model} \li \l{Using Clang Static Analyzer}{Clang Static Analyzer} diff --git a/src/plugins/clangcodemodel/ClangCodeModel.json.in b/src/plugins/clangcodemodel/ClangCodeModel.json.in index 12d976d130b..e7dc0d029dc 100644 --- a/src/plugins/clangcodemodel/ClangCodeModel.json.in +++ b/src/plugins/clangcodemodel/ClangCodeModel.json.in @@ -2,7 +2,7 @@ \"Name\" : \"ClangCodeModel\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", - \"Experimental\" : true, + \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) 2016 The Qt Company Ltd\", \"License\" : [ \"Commercial Usage\",