feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/libs/utils/treemodel.cpp
	src/libs/utils/treemodel.h

Change-Id: I9c5e8ef77905745c201cfc647218c9e747d268d6
This commit is contained in:
Eike Ziller
2024-01-08 14:56:54 +01:00
parent f2cb979aa3 a61f9162f1
commit cf63b1884e
7 changed files with 112 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/qtcreator/images/qtcreator-build-configuration-set-clicolor-force.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

12
doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2023 The Qt Company Ltd.
// Copyright (C) 2024 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
@@ -190,6 +190,16 @@
To hide the output, select the \inlineimage icons/rightsidebaricon.png
(\uicontrol {Hide/Show Right Sidebar}) button or press \key {Alt+Shift+0}.
\section1 CLICOLOR_FORCE Environment Variable
\QC sets the environment variable \c CLICOLOR_FORCE to \e 1 to show
ANSI-colored output for CMake. This might affect the process output.
If the output looks incorrect or different from earlier \QC versions, try
setting \c CLICOLOR_FORCE to \e 0 in \uicontrol {Use Build Environment}.
\image qtcreator-build-configuration-set-clicolor-force.webp {Build Environment with CLICOLOR_FORCE set}
\section1 CMake Build Steps
\QC builds CMake projects by running \c {cmake . --build}, which then runs