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

Doc: Update Qbs settings

Browse Source 
Task-number: QTCREATORBUG-26610
Change-Id: I98261c9fa36f34d8b13a2b12a3a545f6662916b5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Leena Miettinen
2022-02-28 17:37:09 +01:00
parent 691e3ff12d
commit fc82e593af
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/qtcreator/images/creator-qbs-build-app.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
doc/qtcreator/images/qtcreator-build-settings-qbs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

4
doc/qtcreator/src/android/deploying-android.qdoc
View File

@@ -172,8 +172,8 @@
\image qtcreator-android-cmake-settings.png "CMake settings for building AABs"
When building with qmake, you can select the ABIs in the \uicontrol ABIs
field in the \uicontrol {Build Steps}:
When building with Qbs or qmake, you can select the ABIs in the
\uicontrol ABIs field in the \uicontrol {Build Steps}:
\image qtcreator-android-build-steps.png "qmake settings for building AABs"

14
doc/qtcreator/src/projects/creator-only/creator-projects-settings-build-qbs.qdoc
View File

@@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2021 The Qt Company Ltd.
** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -48,8 +48,8 @@
more information, see \l{Using the Performance Analyzer}. To use default
settings, select \uicontrol {Leave at Default}.
For more information about the QML and Qt Quick options, see
\l{Compiling QML}.
For more information about the QML debugging options, see
\l{Setting Up QML Debugging}.
For more information about configuring Qbs, see \l{Setting Up Qbs}.
@@ -65,6 +65,10 @@
include debug symbols in the build for debugging the application and
\uicontrol Release to create the final installation file.
\li In the \uicontrol ABIs field, select the ABIs for
the \l{Connecting Android Devices}{Android} device
architectures to build the project for.
\li In the \uicontrol {Parallel jobs} field, specify the number of
parallel jobs to use for building.
@@ -119,10 +123,6 @@
\endlist
If the \l{glossary-buildandrun-kit}{kit} specifies Qt for Android
version 5.14.0 or later, you can select the ABIs for the Android device
architectures to build the project for in the \uicontrol ABIs field.
The \uicontrol {Equivalent command line} field displays the build command
that is constructed based on the selected options.