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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/qtsupport/examplesparser.cpp

Change-Id: I2a0808261969e8c7cef7fae86d9027a155bf9b14
This commit is contained in:
Eike Ziller
2023-07-19 16:10:37 +02:00
parent f10d0bad01 182104e013
commit 626378de2d
12 changed files with 243 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc
View File

@@ -9,7 +9,12 @@
/*!
\page creator-reference-issues-view.html
\if defined(qtdesignstudio)
\previouspage creator-reference-compile-output-view.html
\nextpage creator-reference-search-results-view.html
\else
\previouspage creator-reference.html
\endif
\ingroup creator-reference-output-views
\ingroup studio-reference-output-views
@@ -59,7 +64,11 @@
/*!
\page creator-reference-search-results-view.html
\if defined(qtdesignstudio)
\previouspage creator-reference-issues-view.html
\else
\previouspage creator-reference.html
\endif
\ingroup creator-reference-output-views
\ingroup studio-reference-output-views
@@ -85,7 +94,12 @@
/*!
\page creator-reference-application-output-view.html
\if defined(qtdesignstudio)
\previouspage creator-how-to-view-output.html
\nextpage creator-reference-compile-output-view.html
\else
\previouspage creator-reference.html
\endif
\ingroup creator-reference-output-views
\ingroup studio-reference-output-views
@@ -127,7 +141,12 @@
/*!
\page creator-reference-compile-output-view.html
\if defined(qtdesignstudio)
\previouspage creator-reference-application-output-view.html
\nextpage creator-reference-issues-view.html
\else
\previouspage creator-reference.html
\endif
\ingroup creator-reference-output-views
\ingroup studio-reference-output-views