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

Merge remote-tracking branch 'origin/4.13'

Browse Source 
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
This commit is contained in:
Eike Ziller
2020-07-01 09:01:26 +02:00
parent 5143e6c8ba ebf03b5c23
commit 5a97e8ceb9
66 changed files with 513 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc
View File

@@ -135,8 +135,9 @@
\endlist
To open the other output panes, such as \uicontrol{General Messages} and
\uicontrol{Version Control}, select \uicontrol Window > \uicontrol {Output Panes}. The menu
items also display the keyboard shortcuts that you can use.
\uicontrol{Version Control}, select \uicontrol View >
\uicontrol {Output Panes}. The menu items also display
the keyboard shortcuts that you can use.
For more information about output panes, see \l{Viewing Output}.

2
doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc
View File

@@ -196,7 +196,7 @@
\b {How do I generate a core file in \QC?}
To trigger the GDB command that generates a core file while debugging,
select \uicontrol Window > \uicontrol Views > \uicontrol {Debugger Log}.
select \uicontrol View > \uicontrol Views > \uicontrol {Debugger Log}.
In the \uicontrol Command field, type \c gcore and press \key Enter. The
core file is created in the current working directory. You can specify
another location for the file, including a relative or absolute path, as an

4
doc/qtcreator/src/howto/creator-ui.qdoc
View File

@@ -286,7 +286,7 @@
{corresponding keyboard shortcut}.
To hide the mode selector and to save space on the display, select
\uicontrol Window > \uicontrol {Mode Selector Style} > \uicontrol Hidden.
\uicontrol View > \uicontrol {Mode Selector Style} > \uicontrol Hidden.
To only show icons on the mode selector, select the \uicontrol {Icons Only}
style.
@@ -402,7 +402,7 @@
\else
\l{Using Git}{Version Control}
\endif
panes, select \uicontrol Window > \uicontrol {Output Panes}.
panes, select \uicontrol View > \uicontrol {Output Panes}.
\if defined(qtcreator)
To display the \uicontrol {To-Do Entries} pane, enable the Todo plugin.
\endif

4
doc/qtcreator/src/howto/creator-workspaces.qdoc
View File

@@ -57,12 +57,12 @@
To close groups of views, select the \uicontrol {Close Group} button.
To open closed views, select \uicontrol Window > \uicontrol Views.
To open closed views, select \uicontrol View > \uicontrol Views.
\section1 Saving Workspaces
The changes you make to a workspace are saved when you exit \QC.
In \QMLD, you can select \uicontrol Window > \uicontrol Workspaces >
In \QMLD, you can select \uicontrol View > \uicontrol Workspaces >
\uicontrol Manage > \uicontrol {Restore last workspace on startup}
to restore the current workspace the next time you start \QC.