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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743
This commit is contained in:
Eike Ziller
2021-12-09 12:02:47 +01:00
parent 420b5bf541 f349de45f4
commit d422b408e0
328 changed files with 2093 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/qtcreator/src/howto/creator-external-tools.qdoc
View File

@@ -51,14 +51,19 @@
\section1 Using Qt Linguist
When you \l{Creating Projects}{create a new project}, you can automatically
generate a translation source file (TS) for one language. You can add other
languages later by editing the project file.
You can use the Qt Linguist release manager tools, lupdate and lrelease,
directly from \QC. The lupdate tool is used to synchronize source
code and translations. The lrelease tool is used to create run-time
translation files for use by the released application.
When you \l{Creating Projects}{create a new project}, you can automatically
generate a translation source file (TS) for one language. You can add other
languages later by editing the project file.
\note Running the tools from \QC is supported only when using qmake as the
build system. For more information about using the tools with CMake, see
\l{https://doc.qt.io/qt-6/cmake-command-reference.html#qt6-linguisttools}
{Qt6::LinguistTools}.
To synchronize TS files from a translator with the
application code, select \uicontrol Tools > \uicontrol External >
@@ -103,7 +108,7 @@
\image qtcreator-external-tools.png
Select the \inlineimage replace.png
Select the \inlineimage icons/replace.png
(\uicontrol {Variables}) button in a field to select from a list of
\l{Using Qt Creator Variables}{variables} that are available in a
particular context.

10
doc/qtcreator/src/howto/creator-help.qdoc
View File

@@ -140,7 +140,7 @@
\list 1
\li Click the \inlineimage bookmark.png
\li Click the \inlineimage icons/bookmark.png
(\uicontrol {Add Bookmark}) button on the toolbar.
\li In the \uicontrol {Add Bookmark} dialog, click \uicontrol OK to save the
@@ -188,7 +188,7 @@
If you cannot find words that you know are there, indexing might not have
been completed for some reason. To regenerate the index, click
\inlineimage reload_gray.png
\inlineimage icons/reload_gray.png
(\uicontrol {Regenerate Index}).
Punctuation is not included in indexed terms. To find terms that contain
@@ -225,7 +225,7 @@
in the \uicontrol {On context help} field. To detach the help window, select
\uicontrol {Always Show in External Window}.
To change this setting in a help view, select the \inlineimage linkicon.png
To change this setting in a help view, select the \inlineimage icons/linkicon.png
toolbar button.
\section1 Selecting the Start Page
@@ -266,7 +266,7 @@
\image qtcreator-help-filter-attributes.png "Filters tab in Help options"
\li Select \inlineimage plus.png
\li Select \inlineimage icons/plus.png
to add a new filter in the \uicontrol {Add Filter} dialog.
\li In the \uicontrol {Filter name} field, enter a name for the filter,
@@ -291,6 +291,6 @@
To rename the selected filter, select \uicontrol Rename.
To remove the selected filter select \inlineimage minus.png
To remove the selected filter select \inlineimage icons/minus.png
.
*/

16
doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc
View File

@@ -325,16 +325,16 @@
\li In the \uicontrol {Test Results} output pane, select:
\list
\li \inlineimage run_small.png
\li \inlineimage icons/run_small.png
(\uicontrol {Run All Tests}) to run all tests.
\li \inlineimage qtcreator-run-selected-tests.png
\li \inlineimage icons/qtcreator-run-selected-tests.png
(\uicontrol {Run Selected Tests}) to run the selected tests.
\li \inlineimage qtcreator-run-failed-tests.png
\li \inlineimage icons/qtcreator-run-failed-tests.png
(\uicontrol {Run Failed Tests}) to re-run the tests which failed
in the last run.
Depending on the framework this may select additional tests if it
is impossible to distinguish or to fully address the test.
\li \inlineimage qtcreator-run-tests-in-current-file.png
\li \inlineimage icons/qtcreator-run-tests-in-current-file.png
(\uicontrol {Run Tests for Current File}) to run the tests
in the file currently open in the code editor.
\endlist
@@ -376,14 +376,14 @@
To refresh the view, select \uicontrol {Rescan Tests} in the context menu.
To show or hide init and cleanup or data functions in the \uicontrol Tests
view, select \inlineimage filtericon.png
view, select \inlineimage icons/filtericon.png
(\uicontrol {Filter Test Tree}), and then select \uicontrol {Show Init and
Cleanup Functions} or \uicontrol {Show Data Functions}. Double-click a
function in the list to open its source code in the code editor.
The test cases are listed in alphabetic, case insensitive order. To list
them in the order in which they are defined in the source code,
select \inlineimage leafsort.png
select \inlineimage icons/leafsort.png
(\uicontrol {Sort Naturally}).
\section2 Running and Debugging Tests from Code Editor
@@ -592,7 +592,7 @@
To view the results of Qt tests as plain text, select \uicontrol Tools >
\uicontrol Options > \uicontrol {Testing} > \uicontrol {Qt Test}, and
then deselect the \uicontrol {Use XML output} check box. Then select the
\inlineimage text.png
\inlineimage icons/text.png
(\uicontrol {Switch Between Visual and Text Display}) button in the
\uicontrol {Test Results} output pane to switch to the text display.
@@ -668,7 +668,7 @@
\endtable
To view only messages of a particular type, select
\inlineimage filtericon.png
\inlineimage icons/filtericon.png
(\uicontrol {Filter Test Results}), and then select the types of messages to
show. To show all messages, select \uicontrol {Check All Filters}. To
deselect all message types, select \uicontrol {Uncheck All Filters}.

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

@@ -160,11 +160,11 @@
You can toggle the left and right sidebar in some \QC modes.
To toggle the left sidebar, click \inlineimage leftsidebaricon.png
To toggle the left sidebar, click \inlineimage icons/leftsidebaricon.png
(\uicontrol {Hide Left Sidebar/Show Left Sidebar}) or press \key Alt+0
(\key Cmd+0 on \macos).
To toggle the right sidebar, click \inlineimage rightsidebaricon.png
To toggle the right sidebar, click \inlineimage icons/rightsidebaricon.png
(\uicontrol {Hide Right Sidebar/Show Right Sidebar}) or press
\key Alt+Shift+0 (\key Cmd+Shift+0 on \macos).

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

@@ -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.
@@ -83,14 +83,15 @@
By default, \QC looks in the QML import path of Qt for QML modules.
Sometimes, it does not get it right and you need to tell it where the
modules are by specifying the \c{QML_IMPORT_PATH} in the \c{.pro} file of
your application.
modules are. When using qmake as the build system, specify the
\c{QML_IMPORT_PATH} in the \c{.pro} file of your application. When
using CMake, add the \c set command to the CMakeLists.txt file.
This also enables code completion of QML code and removes error messages.
The following example illustrates how to specify the import path so that
it works when switching between build and run kits for different target
platforms:
The following example illustrates how to specify the import path for qmake
projects so that it works when switching between build and run kits for
different target platforms:
\code
TEMPNAME = $${QMAKE_QMAKE}
@@ -99,8 +100,8 @@
message("my QML Import Path: "$$QML_IMPORT_PATH)
\endcode
For more information about how to set the import path when using CMake, see
\l {Importing QML Modules}.
For more information about how to set the import path for CMake projects,
see \l {Importing QML Modules}.
\b {What should I do when \QC complains about missing OpenGL support?}
@@ -265,8 +266,16 @@
\b {On Windows:} Output is displayed differently for \e{console
applications} and \e{GUI applications}.
The setting \c {CONFIG += console} in the .pro file specifies that the
application is built as a console application using some other runtime.
For qmake projects, the \c {CONFIG += console} setting in the .pro file
specifies that the application is built as a console application using
some other runtime.
This is the standard behavior for CMake projects. To create a GUI
application on Windows or an application bundle on \macos, you must
specify the \c WIN32 or \c MACOSX_BUNDLE property for the
\l{https://doc.qt.io/qt-6/qt-add-executable.html}{qt_add_executable}
command in the CMakeLists.txt file.
When you run a console application, you can view the output in the console
window of the calling application. If the
calling application is a GUI application (for example, a release-built

5
doc/qtcreator/src/howto/creator-sessions.qdoc
View File

@@ -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.
@@ -53,7 +53,8 @@
\li Projects
\if defined(qtcreator)
with their dependencies (including SUBDIRS projects)
with their dependencies (including SUBDIRS projects when using
qmake)
\endif
\li Editors