From 23d5a28968c1443cd0fa107f016d5f9c4f73b623 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 7 Jan 2021 11:49:30 +0100 Subject: [PATCH] Doc: Add docs for Conan package manager plugin Task-number: QTCREATORBUG-21785 Change-Id: I616fdfe808fdc5490ac17e95c1554a74524b0444 Reviewed-by: Kai Koehne --- .../qtcreator-build-steps-conan-install.png | Bin 0 -> 8032 bytes .../creator-projects-conan-building.qdocinc | 44 ++++++++++++ .../src/conan/creator-projects-conan.qdoc | 66 ++++++++++++++++++ .../src/howto/creator-only/creator-cli.qdoc | 2 +- .../creator-projects-incredibuild.qdoc | 2 +- .../creator-only/creator-projects-other.qdoc | 9 ++- .../creator-projects-settings-build.qdoc | 3 +- doc/qtcreator/src/qtcreator-toc.qdoc | 1 + 8 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 doc/qtcreator/images/qtcreator-build-steps-conan-install.png create mode 100644 doc/qtcreator/src/conan/creator-projects-conan-building.qdocinc create mode 100644 doc/qtcreator/src/conan/creator-projects-conan.qdoc diff --git a/doc/qtcreator/images/qtcreator-build-steps-conan-install.png b/doc/qtcreator/images/qtcreator-build-steps-conan-install.png new file mode 100644 index 0000000000000000000000000000000000000000..09ab3549aa2952ad04c89384ecc3d2279b70b1b5 GIT binary patch literal 8032 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 M>FVdQ&MBb@0D|1WJOBUy literal 0 HcmV?d00001 diff --git a/doc/qtcreator/src/conan/creator-projects-conan-building.qdocinc b/doc/qtcreator/src/conan/creator-projects-conan-building.qdocinc new file mode 100644 index 00000000000..c4d8ff26e52 --- /dev/null +++ b/doc/qtcreator/src/conan/creator-projects-conan-building.qdocinc @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! +//! [conan build steps] + \section1 Specifying Build Settings for Conan + + To configure a project to be built using the Conan package manager, select + \uicontrol {Add Build Step} > \uicontrol {Run Conan Install}. + + \image qtcreator-build-steps-conan-install.png "Conan Install build step" + + In the \uicontrol {Conan file} field, enter the location of the + \e conanfile.txt file for the project. + + The \uicontrol {Conan install} field displays the effective + build command. You can add arguments for the command in the + \uicontrol {Additional arguments} field. + + For more information about configuring Conan, see \l{Setting Up Conan}. +//! [conan build steps] +*/ diff --git a/doc/qtcreator/src/conan/creator-projects-conan.qdoc b/doc/qtcreator/src/conan/creator-projects-conan.qdoc new file mode 100644 index 00000000000..a846c252047 --- /dev/null +++ b/doc/qtcreator/src/conan/creator-projects-conan.qdoc @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \page creator-project-conan.html + \previouspage creator-project-incredibuild.html + \nextpage creator-cli.html + + \title Setting Up Conan + + \l {https://conan.io}{Conan} is a C/C++ package manager that speeds up the + integration of C or C++ libraries into your own project. It's available on + all the \l{Supported Platforms}{supported development platforms}. + + Conan can be integrated into most build systems that are integrated into + \QC: + + \list + \li \l{https://docs.conan.io/en/latest/integrations/cmake.html}{CMake} + \li \l{https://docs.conan.io/en/latest/integrations/qbs.html}{Qbs} + \li \l{https://docs.conan.io/en/latest/integrations/qmake.html}{qmake} + \li \l{https://docs.conan.io/en/latest/integrations/meson.html}{Meson} + \endlist + + The client-server architecture of Conan enables the client to fetch packages + from and upload them to remote servers that act as package storage. The + client creates the packages, and if necessary, handles building them from + sources. Because the client has a local cache for package storage, you can + work offline, as long as no new packages are needed from remote servers. + + To use Conan, install it by using the Qt installer. + + To enable the experimental Conan plugin, select \uicontrol Help > + \uicontrol {About Plugins} > \uicontrol Utilities > \uicontrol Conan. + Then select \uicontrol {Restart Now} to restart \QC and load the plugin. + + For each project, you must write a + \l{https://docs.conan.io/en/latest/reference/conanfile.html}{conanfile.py} + or \l{https://docs.conan.io/en/latest/reference/conanfile_txt.html} + {conanfile.txt} file that specifies the needed libraries and packages. + Then, you must edit the build settings of the project to specify the + location of the file and the contents of the Conan install command. + For more information, see \l {Specifying Build Settings for Conan}. +*/ diff --git a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc index d81a3e6443e..f8356b86d5b 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \previouspage creator-project-incredibuild.html + \previouspage creator-project-conan.html \page creator-cli.html \nextpage creator-keyboard-shortcuts.html diff --git a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild.qdoc b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild.qdoc index 91cde5ab277..5791b49b491 100644 --- a/doc/qtcreator/src/incredibuild/creator-projects-incredibuild.qdoc +++ b/doc/qtcreator/src/incredibuild/creator-projects-incredibuild.qdoc @@ -26,7 +26,7 @@ /*! \previouspage creator-project-meson.html \page creator-project-incredibuild.html - \nextpage creator-cli.html + \nextpage creator-project-conan.html \title Setting Up IncrediBuild diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc index 3e373c7952a..635fbd19ba4 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -82,6 +82,13 @@ IncrediBuild decreases the time it takes to build C++ code. + \li \l{Setting Up Conan} + + The experimental Conan plugin integrates the Conan package manager + that speeds up the integration of C or C++ libraries into your + project. You can use Conan with most build systems integrated into + \QC. + \endlist */ diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc index 4d13904606f..1acaa51a7cc 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc @@ -46,7 +46,7 @@ If you selected CMake as the build system for the project, you can use a \e {minimum size release} build configuration to create the - final installation file. It is a release build that makes the size + final installation file. It is a release build that makes the size of the binary package as small as possible, even if this makes the application slower. @@ -182,6 +182,7 @@ \include creator-projects-settings-build-qbs.qdocinc qbs build steps \include creator-projects-meson-building.qdocinc meson build steps \include creator-projects-incredibuild-building.qdocinc incredibuild build steps + \include creator-projects-conan-building.qdocinc conan build steps \section2 Adding Custom Build Steps diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index edaf3bad4e4..85ae72493a5 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -277,6 +277,7 @@ \li \l{Setting Up Nimble} \li \l{Setting Up Meson} \li \l{Setting Up IncrediBuild} + \li \l{Setting Up Conan} \endlist \li \l{Using Command Line Options} \li \l{Keyboard Shortcuts}