openkylin
/
qtbase-opensource-src
mirror of https://gitee.com/openkylin/qtbase-opensource-src.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

New upstream version 5.15.10+dfsg

This commit is contained in:
韩品龙 2023-11-20 09:27:54 +08:00
parent 93853f98eb
commit cb3f68d1e3
2094 changed files with 46395 additions and 35395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
.QT-ENTERPRISE-LICENSE-AGREEMENT
View File

@ -1061,6 +1061,7 @@ The Agreement includes following Appendices 1-10, as applicable.
- Appendix 8: Intentionally left blank (optional) - Appendix 8: Intentionally left blank (optional)
- Appendix 9: Support Terms - Appendix 9: Support Terms
- Appendix 10: Conversion from legacy Licenses to Subscription (optional) - Appendix 10: Conversion from legacy Licenses to Subscription (optional)
- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
APPENDIX 1: LICENSED SOFTWARE APPENDIX 1: LICENSED SOFTWARE
@ -1252,7 +1253,7 @@ only ("Redistributables") are marked with "R" in the below table.
+----------------------------------------------------------+ +----------------------------------------------------------+
| Device Utilities | | | X,R | X,R | | Device Utilities | | | X,R | X,R |
+----------------------------------------------------------+ +----------------------------------------------------------+
| Qt Debugging Bridge (QBD) Daemon | | | X,R | X,R | | Qt Debugging Bridge (QDB) Daemon | | | X,R | X,R |
+----------------------------------------------------------+ +----------------------------------------------------------+
| Qt Quick Ultralite Controls | | | X,R | X,R | | Qt Quick Ultralite Controls | | | X,R | X,R |
+----------------------------------------------------------+ +----------------------------------------------------------+
@ -1668,116 +1669,152 @@ Content Format and Channel as mentioned in paragraph 3 and 4.
APPENDIX 8: INTENTIONALLY LEFT BLANK APPENDIX 8: INTENTIONALLY LEFT BLANK
APPENDIX 9: SUPPORT TERMS APPENDIX 9: SUPPORT TERMS
Version 2023-04
These Qt support terms and conditions ("Support Terms") set forth the legal These Qt support terms and conditions (“Support Terms”) set forth the legal
framework, where under The Qt Company ("The Qt Company") provides support framework, where under The Qt Company (“The Qt Company”) provides support
services (as herein defined) to the Licensee. services (as herein defined) to the Licensee.
1 DEFINITIONS 1 DEFINITIONS
"Application Code" shall mean a computer software program written strictly “Application Code” shall mean a computer software program written strictly
using the Qt programming language, by or for the Licensee, with a user using the Qt programming language, by or for the Licensee, with a user
interface, enabling the Licensee or their users to accomplish a specific task interface, enabling the Licensee or their users to accomplish a specific task
and display any results of the task on the display monitor or screen. and display any results of the task on the display monitor or screen.
"Dedicated Contact" shall mean the employee of The Qt Company who will be the “Customer Portal” shall mean The Qt Company’s web-based service and support
first point of contact for all Designated Users' requests for Support. user interface located at https://account.qt.io/ or at another location
designated by The Qt Company. Customer Portal is used by a Designated User with
Qt Account, and it provides downloads, license management, license certificate
and other services for Designated Users.
"Errors" shall mean an error, flaw, mistake, failure, or fault in Licensed “Dedicated Contact” shall mean the employee of The Qt Company who will be the
first point of contact for all Designated Users’ requests for Support.
“Errors” shall mean an error, flaw, mistake, failure, or fault in Licensed
Software that prevents it from behaving as described in the relevant Software that prevents it from behaving as described in the relevant
documentation or as agreed between the Parties. documentation or as agreed between the Parties. Designated User can follow the
state and progress of Errors in Customer Portal.
"Extended Support" shall mean a continuation to the normal Support period, “Extended Support” shall mean a continuation to the normal Support period,
which allows Designated Users to receive selected Support (Standard Support or which allows Designated Users to receive selected Support (Standard Support or
Premium Support) for a version of Licensed Software that is no longer generally Premium Support) for a version of Licensed Software that is no longer generally
supported by The Qt Company. supported by The Qt Company.
"Install Support" shall mean Support that is limited to installation related ”Install Support” shall mean Support that is limited to installation-related
Error(s) on Development Platforms specified as supported host platforms for Error(s) on Development Platforms specified as supported host platforms for
each Qt release under doc.qt.io. each Qt release under doc.qt.io. Install Support covers also operational use of
the QA Tools, but not operational use of Qt Software.
"Maintenance Release" shall mean a release or version of Licensed Software “Maintenance Release” shall mean a release or version of Licensed Software
containing bug fixes, error corrections and other changes targeted to containing bug fixes, error corrections and other changes targeted to
maintaining and improving product stability and quality. Maintenance Releases maintaining and improving product stability and quality. Maintenance Releases
are generally depicted as a change to the third digit of Licensed Software are generally depicted as a change to the third digit of Licensed Software
version number. version number.
"Platforms" shall mean both Development Platforms and Deployment Platforms. “Platforms” shall mean both Development Platforms and Deployment Platforms.
Supported host and target Platforms may vary from for each Qt release as Supported host and target Platforms may vary from for each Qt release as
defined under doc.qt.io. defined under doc.qt.io.
"Premium Support" shall mean an upgraded level of Support that The Qt Company “Premium Support” shall mean an upgraded level of Support that The Qt Company
provides pursuant to these Support Terms to Licensee if Licensee has purchased provides pursuant to these Support Terms to Licensee if Licensee has purchased
Premium Support instead of Standard Support. Premium Support shall always be Premium Support instead of Standard Support. Premium Support also covers what
purchased for all Designated User(s) in the respective development team of the is included in Standard Support. Premium Support shall always be purchased for
Licensee. all Designated User(s) in the respective development team of the Licensee.
"Response Time" shall mean the period of time from when Licensee notifies “Qt Account” shall mean the Qt Account for a Designated User used for using Qt
TheQt Company about an Error or requests Support until The Qt Company provides services and Customer Portal. A Qt Account is mapped to the Licensee company
with the corporate email domain or domains.
”Qualification Kit” shall mean a set of documents and validation test cases
used for product certification needs as defined in section 2.6.
“Response Time” shall mean the period of time from when Licensee notifies The
Qt Company about an Error or requests Support until The Qt Company provides
Licensee with a response that addresses (but not necessarily resolves) the Licensee with a response that addresses (but not necessarily resolves) the
reported Error or provides the requested Support. reported Error or provides the requested Support.
"Standard Support" shall mean standard level of Support that The Qt Company “Standard Support” shall mean standard level of Support that The Qt Company
provides pursuant to these Support Terms to Licensee. provides pursuant to these Support Terms to Licensee. Standard Support also
covers what is included in Install Support.
"Support" shall mean developer assistance that is provided by The Qt Company “Security Issue” shall mean an Error that may cause a vulnerability in a system
to assist eligible Designated Users in Licensed Software installation, usage or application that uses the Licensed Software.
and functionality problem resolution for Error(s) and Error workarounds
pursuant to the terms of these Support Terms. Support for different products is
available as specified in the below table ("X" marking the Support that is
included in the license price, optional Add-on Support services are marked as
"O"):
+-----------------------------------------------------------------------+ “Support” shall mean developer assistance that is provided by The Qt Company to
| |ADP|ADE|DCP|DCE|DSP|DSE|Squish|Coco|Test Center| assist eligible Designated Users in Licensed Software installation, usage and
+-----------------------------------------------------------------------+ functionality problem resolution for Error(s) and Error workarounds pursuant to
| Install Support | X | X | X | X | X | X | X | X | X | the terms of these Support Terms. Support for different products is available
+-----------------------------------------------------------------------+ as specified in the below table (‘X’ marking the Support that is included in
| Standard Support | | X | X | X | X | X | X | X | X | the license price, optional Add-on Support services are marked as ‘O’):
+-----------------------------------------------------------------------+
| Premium Support | | O | O | O | O | O | O | O | O |
+-----------------------------------------------------------------------+
| Extended Support | | O | O | O | O | O | | | |
+-----------------------------------------------------------------------+
| Tool Qualification Kit| | | | | | | O | O | |
+-----------------------------------------------------------------------+
"Support Validity Term" shall mean the Development License Term or any other +-----------------------------------------------------------------------------+
fixed time period agreed between the Parties during which time the Customer is | | Install| Standard| Premium| Extended| Qualification|
| | Support| Support | Support| Support | Kit |
+-----------------------------------------------------------------------------+
| DSP | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DSE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| ADP | X | | | | |
+-----------------------------------------------------------------------------+
| ADE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DCP | X | X | O | O | |
+-----------------------------------------------------------------------------+
| DCE | X | X | O | O | |
+-----------------------------------------------------------------------------+
| Squish | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Coco | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Test Center | X | X | O | | O |
+-----------------------------------------------------------------------------+
| Axivion Suite | X | X | | | |
+-----------------------------------------------------------------------------+
| Architecture Analysis | X | X | | | |
+-----------------------------------------------------------------------------+
| Static Code Analysis | X | X | | | |
+-----------------------------------------------------------------------------+
| Static Coverage | X | X | | | |
| Analysis Professional | | | | | |
+-----------------------------------------------------------------------------+
| Qt Insight | | X | | | |
+-----------------------------------------------------------------------------+
“Support Validity Term” shall mean the Development License Term or any other
fixed time period agreed between the Parties during which time the Licensee is
eligible to receive Support from The Qt Company. eligible to receive Support from The Qt Company.
"Tool Qualification Kit" shall mean a customized set of documents and
validation test cases.
2 SUPPORT SERVICES 2 SUPPORT SERVICES
2.1 Support Services Provided by The Qt Company 2.1 Support Services Provided by The Qt Company
Subject to these Support Terms and during the Support Validity Term, The Qt Subject to these Support Terms and during the Support Validity Term, The Qt
Company will via its web-based support user-interface, provide Designated Company will via its Customer Portal, provide Designated User(s) with Support
User(s) with Support for the Platforms which Customer has licensed under the for the Licensed Software which Licensee has licensed under the Agreement. The
Agreement. Qt Company will make commercially reasonable efforts to solve any Errors
The Qt Company will make commercially reasonable efforts to solve any Errors
reported by Designated User(s). Resolution of an Error may be provided through reported by Designated User(s). Resolution of an Error may be provided through
Designated User(s) themselves downloading of a later released version of the Designated User(s) themselves downloading of a later released version of the
applicable Licensed Software product(s) or providing the Designated User with a applicable Licensed Software product(s) or providing the Designated User with a
temporary workaround addressing such Error. workaround addressing such Error or providing the Designated User with an
updated tool configuration.
2.2 Licensee's Obligations 2.2 Licensee's Obligations
To report an Error, the Designated User shall register the Error on The Qt To report an Error, the Designated User shall register the Error on the
Company's web-based support user interface located at: Customer Portal. If the Designated User considers the reported Error to be a
https://account.qt.io/login or at another location designated by The Qt Company. Security Issue, the Error shall be marked as a Security Issue.
The Designated User must provide adequate information and documentation to The The Designated User must provide adequate information and documentation to The
Qt Company to enable it to recreate the Error or problem for which the Qt Company to enable it to recreate the Error or problem for which the
Designated User has sought assistance. Designated User has sought assistance. To ensure efficient handling of Errors,
To ensure efficient handling of Errors, the Designated User must provide the the Designated User must provide the following information, where relevant:
following information, where relevant:
- A clear, detailed description of the problem, question or suggestion; - A clear, detailed description of the problem, question or suggestion;
- Identification of which Licensed Software product and version is affected; - Identification of which Licensed Software product and version is affected;
- Identification of the operating environment (e.g. operating system, hardware - Identification of the operating environment (e.g. operating system, hardware
Platform, build tools, etc.) on which the problem exists; Platform, build tools, tool configuration, etc.) on which the problem exists;
- Marking the issue as a Security Issue, when reporting a Security Issue;
- On Standard Support: A complete and compilable test case of not more than 500 - On Standard Support: A complete and compilable test case of not more than 500
lines of code that demonstrates the problem; lines of code that demonstrates the problem;
- On Premium Support: A complete and compilable test case that demonstrates the - On Premium Support: A complete and compilable test case that demonstrates the
@ -1799,29 +1836,30 @@ General limitations:
Each version or release of the Licensed Software will be Supported under Each version or release of the Licensed Software will be Supported under
Standard Support or Premium Support only for limited time period as set forth Standard Support or Premium Support only for limited time period as set forth
in doc.qt.io. For example, regular releases of Qt Software are supported for in doc.qt.io or in documentation provided with the respective Licensed Software
one (1) year from the release date of the version x.y.0 and Long Term Support product. If nothing is documented, a release of Licensed Software is supported
(LTS) Releases are supported for a period of three (3) years from the release for one (1) year from the release date of the version x.y.0 and Long Term
date of the LTS version x.y.0. Support (LTS) Releases are supported for a period of three (3) years from the
release date of the LTS version x.y.0.
The Qt Company shall only provide Support for Designated User(s). The Qt Company shall only provide Support for Designated User(s) through
Customer Portal.Support is made available for the entire development teams
Support is made available for the entire development teams only: It is not only: It is not allowed to purchase Support only for some members of the
allowed to purchase Support only for some members of the development team, and development team, and all Designated Users of the respective development team
all Designated Users of the respective development team must be eligible for must be eligible for the same level of Support.
the same level of Support.
Support is not provided for snapshots, preview releases, beta releases or Support is not provided for snapshots, preview releases, beta releases or
release candidates. release candidates.
The Qt Company shall have no obligation to provide Support for hardware or The Qt Company shall have no obligation to provide Support for 3rd party
operating system specific problems or problems arising from improper use, components, hardware or operating system specific problems or problems arising
accident, neglect or modification of Qt. from improper use, accident, neglect, or modification of Qt.
Limitations with Install Support: Limitations with Install Support:
Support limited to Error(s) regarding installation and setting up of the Qt Support limited to (i) Error(s) regarding installation and setting up of the Qt
development environment on host Platforms. development environment on host Platforms, or (ii) Errors impacting operational
use of the QA Tools.
Limitations with Standard Support: Limitations with Standard Support:
@ -1847,31 +1885,60 @@ will make commercially reasonable efforts to provide a solution on closest
corresponding supported Platform. corresponding supported Platform.
Premium Support is optional and purchased for an agreed bucket of hours Premium Support is optional and purchased for an agreed bucket of hours
("Bucket"). Hours can be used by any Designated User in the respective (“Bucket”). Hours can be used by any Designated User in the respective
development team. To encourage continuous usage of the Support, ten percent development team. To encourage continuous usage of the Support, ten percent
(10%) of the purchased Bucket shall automatically expire (regardless of whether (10%) of the purchased Bucket shall automatically expire (regardless of whether
such support hours are actually used or not by the Licensee) each month after such support hours are actually used or not by the Licensee) each month after
three (3) months from the purchase of the Premium Support. three (3) months from the purchase of the Premium Support.
2.4 Extended Support 2.4 Handling of Security Issues
The reported Errors marked as Security Issues will be assessed by experts to
determine the severity of the issue and to verify if it indeed is a valid
Security Issue. The Designated User who reported the issue may be contacted for
more details. If the reported issue is not deemed to be a Security Issue, it
will be treated as a normal Error and handled accordingly.
A verified Security Issue will be fixed as soon as possible. Qt Company will
notify all Licensees via appropriate channels about the Security Errors and
availability of patches for Licensed Software. Typically, a fix for the
Security Issue is included in the next Maintenance Release of Licensed
Software.
If the Security Issue is reported in a third-party library used in Licensed
Software, The Qt Company will notify the relevant third party of such Security
Issue detected in their library. When the Security Issue is fixed in the
third-party library, the new version of the third-party library will be in the
next feasible Maintenance Release of the Licensed Software. If a fixed version
of the third-party library is not available, The Qt Company may instead decide
to include documentation regarding the issue, or a patch for this third-party
library.
All known Security Issues in Licensed Software will be mentioned as part of the
change notes released with each version of Licensed Software.
2.5 Extended Support
Extended Support extends the Support Validity Term for a release of Licensed Extended Support extends the Support Validity Term for a release of Licensed
Software that is no longer generally supported. Software that is no longer generally supported.
Extended Support includes and is by default provided with Standard Support Extended Support includes and is by default provided with Standard Support
rules and limitations, unless Extended Support is purchased with Premium rules and limitations, unless Extended Support is purchased together with
Support in which case Premium Support rules and limitations will apply. Premium Support in which case Premium Support rules and limitations will apply.
Extended Support is optional and purchased with annual fee and separately per Extended Support is optional and purchased with annual fee and separately per
each Licensee product. Extended Support will need definition of (i) Licensee each Licensee product. Extended Support will need definition of (i) Licensee
product, (ii) used Platform(s) and (iii) Licensed Software version(s). product, (ii) used Platform(s) and (iii) Licensed Software version(s). For
avoidance of doubt, Extended Support requires that the Designated User has a
valid license for the respective Licensed Software.
2.5 Tool Qualification Kit 2.6 Qualification Kit
The Qt Company shall provide set of customized documents and validation tests The Qt Company shall provide a set of documents and validation tests that
that enable Licensee to qualify QA testing tool for the purpose of ISO 26262, enable the Licensee to qualify QA testing tool (subject to a separate fee) or
EN 50128, DO-330, IEC 61508, IEC 62304 or IEC 13485 certification Licensee end Qt Safe Renderer for the purpose of safety certification of Licensee end-to-end
to end solution. solution. Exact complied safety standards may vary between products, used
features, use case, and industry.
3 RESPONSE TIME 3 RESPONSE TIME
@ -1884,6 +1951,9 @@ exceed two (2) business days.
Premium Support: Errors and Support requests will have a Response Time not to Premium Support: Errors and Support requests will have a Response Time not to
exceed one (1) business day. exceed one (1) business day.
Security Issues: Errors that are Security Issues will have a Response Time not
to exceed one (1) business day.
For complex issues, The Qt Company may provide an initial response to the For complex issues, The Qt Company may provide an initial response to the
Designated User and then follow up, without undue delay, with additional Designated User and then follow up, without undue delay, with additional
communication before an Error is properly addressed or Support provided. communication before an Error is properly addressed or Support provided.
@ -1907,7 +1977,7 @@ All Support requests will be handled with high priority.
5 MAINTENANCE RELEASES, UPDATES AND UPGRADES 5 MAINTENANCE RELEASES, UPDATES AND UPGRADES
Under the Support the Customer is eligible for Maintenance Releases and Updates Under the Support the Licensee is eligible for Maintenance Releases and Updates
that The Qt Company generally makes available to customers who has purchased that The Qt Company generally makes available to customers who has purchased
Support. Unless otherwise decided by The Company at its free and absolute Support. Unless otherwise decided by The Company at its free and absolute
discretion, Upgrades will not be provided under the Support. discretion, Upgrades will not be provided under the Support.
@ -1919,6 +1989,7 @@ previous version of Licensed Software:
- Fixes related to build issues on supported Platforms; - Fixes related to build issues on supported Platforms;
- Error corrections specific to a single Platform that are not present on other - Error corrections specific to a single Platform that are not present on other
Platforms; Platforms;
- Corrections to Security Issues;
- Critical Error corrections such as crashes, data corruption, loss of data, - Critical Error corrections such as crashes, data corruption, loss of data,
race conditions; and race conditions; and
- Updates to documentation and license information when deemed necessary by - Updates to documentation and license information when deemed necessary by
@ -1975,3 +2046,46 @@ remain outstanding on the Current Licenses under the applicable terms Licensee
will continue to make such payments in accordance with the applicable order will continue to make such payments in accordance with the applicable order
documentation, notwithstanding the fact that the Current Licenses are being documentation, notwithstanding the fact that the Current Licenses are being
converted to Development Licenses pursuant to this Appendix. converted to Development Licenses pursuant to this Appendix.
APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
Version 1.0
Qt Insight Tracker Library ("Tracker Library") is a software module used to
collect end user data from Customer's Application and Devices relating to The
Qt Company's Qt Insight online service the Customer is ordering from The Qt
Company under a separate service agreement ("Service Agreement").
Unless otherwise set forth herein, definitions written in capital letters used
herein shall have the meaning set forth in the Service Agreement.
Subject to these terms The Qt Company grants to Customer a worldwide,
non-exclusive, non-transferable, royalty-free, revocable (for cause) right and
license, valid for the term of the Service Agreement, to
(i) use, copy and modify Tracker Library for the purpose of including it
into the Devices and Applications and solely for the purpose of being
used only in conjunction with Insight Cloud or Insight Private Cloud,
and
(ii) distribute, by itself or through its Contractors, Tracker Library as
installed, incorporated, or integrated into Applications and/or
Devices.
Use of Tracker Library in a way or for the purpose other than the above is
strictly prohibited. Tracker Library is licensed to the Customer in all
respects "as is".
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT
WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT
IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
UNINTERRUPTED.
IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF
PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT,
SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY
KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER
LIBRARY.
THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO
EVENT EXCEED 10,000 EUROS.

2
.qmake.conf
View File

@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
QT_SOURCE_TREE = $$PWD QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD) QT_BUILD_TREE = $$shadowed($$PWD)
MODULE_VERSION = 5.15.8 MODULE_VERSION = 5.15.10

2
.release-timestamp
View File

@ -1 +1 @@
QT_PACKAGEDATE_STR=2022-11-12 QT_PACKAGEDATE_STR=2023-06-01

2
.tag
View File

@ -1 +1 @@
4ee4fc18b4067b90efa46ca9baba74f53b54d9ec 29400a683f96867133b28299c0d0bd6bcf40df35

2472
LICENSE.QT-LICENSE-AGREEMENT
View File

File diff suppressed because it is too large Load Diff

2
config_help.txt
View File

@ -142,7 +142,7 @@ Build options:
sanitizers or generate instrumented code to collect execution sanitizers or generate instrumented code to collect execution
counts and enable code coverage analysis, respectively. (Clang only) counts and enable code coverage analysis, respectively. (Clang only)
-c++std <edition> .... Select C++ standard <edition> [c++2a/c++17/c++14/c++11] -c++std <edition> .... Select C++ standard <edition> [c++2b/c++2a/c++17/c++14/c++11]
(Not supported with MSVC 2015) (Not supported with MSVC 2015)
-sse2 ................ Use SSE2 instructions [auto] -sse2 ................ Use SSE2 instructions [auto]

8
configure vendored
View File

@ -474,6 +474,10 @@ while [ "$#" -gt 0 ]; do
VAR=`echo $1 | sed 's,^-\(.*\),\1,'` VAR=`echo $1 | sed 's,^-\(.*\),\1,'`
VAL="yes" VAL="yes"
;; ;;
# Special case for macOS universal builds
QMAKE_APPLE_DEVICE_ARCHS=*)
QMAKE_APPLE_DEVICE_ARCHS=`echo $1 | sed 's,^QMAKE_APPLE_DEVICE_ARCHS=\(.*\),\1,'`
;;
# most options don't need processing in the configure script, skip them. qmake will do the real validation # most options don't need processing in the configure script, skip them. qmake will do the real validation
*) *)
shift shift
@ -781,6 +785,10 @@ setBootstrapVariable()
if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$BUILD_ON_MAC" = "yes" ]; then
echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile" echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile"
for arch in $QMAKE_APPLE_DEVICE_ARCHS; do
echo "EXTRA_CXXFLAGS += -arch $arch" >> "$mkfile"
echo "EXTRA_LFLAGS += -arch $arch" >> "$mkfile"
done
cat "$in_mkfile" >> "$mkfile" cat "$in_mkfile" >> "$mkfile"
echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile" echo "-include \$(notdir \$(DEPEND_SRC:%.cpp=%.d))" >> "$mkfile"
else else

22
configure.json
View File

@ -380,6 +380,20 @@
"qmake": "CONFIG += c++11 c++14 c++17 c++2a" "qmake": "CONFIG += c++11 c++14 c++17 c++2a"
} }
}, },
"cxx2b": {
"label": "C++2b support",
"type": "compile",
"test": {
"head": [
"#if __cplusplus > 202002L",
"// Compiler claims to support experimental C++2b, trust it",
"#else",
"# error __cplusplus must be > 202002L (the value for C++20)",
"#endif"
],
"qmake": "CONFIG += c++11 c++14 c++17 c++2a c++2b"
}
},
"precompile_header": { "precompile_header": {
"label": "precompiled header support", "label": "precompiled header support",
"type": "compile", "type": "compile",
@ -1002,6 +1016,12 @@
"condition": "features.c++17 && tests.cxx2a", "condition": "features.c++17 && tests.cxx2a",
"output": [ "publicFeature", "publicQtConfig" ] "output": [ "publicFeature", "publicQtConfig" ]
}, },
"c++2b": {
"label": "C++2b",
"autoDetect": false,
"condition": "features.c++2a && tests.cxx2b",
"output": [ "publicFeature", "publicQtConfig" ]
},
"c89": { "c89": {
"label": "C89" "label": "C89"
}, },
@ -1554,7 +1574,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
{ {
"message": "Using C++ standard", "message": "Using C++ standard",
"type": "firstAvailableFeature", "type": "firstAvailableFeature",
"args": "c++2a c++17 c++14 c++11" "args": "c++2b c++2a c++17 c++14 c++11"
}, },
{ {
"type": "feature", "type": "feature",

9
configure.pri
View File

@ -22,18 +22,27 @@ defineTest(qtConfCommandline_cxxstd) {
qtConfCommandlineSetInput("c++14", "no") qtConfCommandlineSetInput("c++14", "no")
qtConfCommandlineSetInput("c++1z", "no") qtConfCommandlineSetInput("c++1z", "no")
qtConfCommandlineSetInput("c++2a", "no") qtConfCommandlineSetInput("c++2a", "no")
qtConfCommandlineSetInput("c++2b", "no")
} else: contains(val, "(c\+\+)?(14|1y)") { } else: contains(val, "(c\+\+)?(14|1y)") {
qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "no") qtConfCommandlineSetInput("c++1z", "no")
qtConfCommandlineSetInput("c++2a", "no") qtConfCommandlineSetInput("c++2a", "no")
qtConfCommandlineSetInput("c++2b", "no")
} else: contains(val, "(c\+\+)?(17|1z)") { } else: contains(val, "(c\+\+)?(17|1z)") {
qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "yes") qtConfCommandlineSetInput("c++1z", "yes")
qtConfCommandlineSetInput("c++2a", "no") qtConfCommandlineSetInput("c++2a", "no")
qtConfCommandlineSetInput("c++2b", "no")
} else: contains(val, "(c\+\+)?(2a)") { } else: contains(val, "(c\+\+)?(2a)") {
qtConfCommandlineSetInput("c++14", "yes") qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "yes") qtConfCommandlineSetInput("c++1z", "yes")
qtConfCommandlineSetInput("c++2a", "yes") qtConfCommandlineSetInput("c++2a", "yes")
qtConfCommandlineSetInput("c++2b", "no")
} else: contains(val, "(c\+\+)?(2b)") {
qtConfCommandlineSetInput("c++14", "yes")
qtConfCommandlineSetInput("c++1z", "yes")
qtConfCommandlineSetInput("c++2a", "yes")
qtConfCommandlineSetInput("c++2b", "yes")
} else { } else {
qtConfAddError("Invalid argument $$val to command line parameter $$arg") qtConfAddError("Invalid argument $$val to command line parameter $$arg")
} }

2
doc/global/config.qdocconf
View File

@ -3,7 +3,7 @@
dita.metadata.default.author = Qt Project dita.metadata.default.author = Qt Project
dita.metadata.default.permissions = all dita.metadata.default.permissions = all
dita.metadata.default.publisher = Qt Project dita.metadata.default.publisher = Qt Project
dita.metadata.default.copyryear = 2020 dita.metadata.default.copyryear = 2022
dita.metadata.default.copyrholder = The Qt Company Ltd dita.metadata.default.copyrholder = The Qt Company Ltd
dita.metadata.default.audience = programmer dita.metadata.default.audience = programmer

446
doc/global/externalsites/qtcreator.qdoc
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the documentation of the Qt Toolkit. ** This file is part of the documentation of the Qt Toolkit.
@ -25,603 +25,641 @@
** **
****************************************************************************/ ****************************************************************************/
// Up-to-date with Qt Creator 6.0.0
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-deployment-qnx.html \externalpage https://doc.qt.io/qtcreator/creator-deployment-qnx.html
\title Qt Creator: Deploying Applications to QNX Neutrino Devices \title Qt Creator: Deploying Applications to QNX Neutrino Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-developing-baremetal.html \externalpage https://doc.qt.io/qtcreator/creator-developing-baremetal.html
\title Qt Creator: Connecting Bare Metal Devices \title Qt Creator: Connecting Bare Metal Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-developing-qnx.html \externalpage https://doc.qt.io/qtcreator/creator-developing-qnx.html
\title Qt Creator: Connecting QNX Devices \title Qt Creator: Connecting QNX Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-developing-generic-linux.html \externalpage https://doc.qt.io/qtcreator/creator-developing-generic-linux.html
\title Qt Creator: Connecting Embedded Linux Devices \title Qt Creator: Connecting Generic Remote Linux Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-deployment-embedded-linux.html \externalpage https://doc.qt.io/qtcreator/creator-developing-mcu.html
\title Qt Creator: Deploying Applications to Embedded Linux Devices \title Qt Creator: Connecting MCUs
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-faq.html \externalpage https://doc.qt.io/qtcreator/creator-setup-webassembly.html
\title Qt Creator: Building Applications for the Web
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-deployment-embedded-linux.html
\title Qt Creator: Deploying Applications to Generic Remote Linux Devices
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-faq.html
\title Qt Creator: FAQ \title Qt Creator: FAQ
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-tips.html \externalpage https://doc.qt.io/qtcreator/creator-how-tos.html
\title Qt Creator: Tips and Tricks \title Qt Creator: How-tos
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-help.html \externalpage https://doc.qt.io/qtcreator/creator-help.html
\title Qt Creator: Using the Help Mode \title Qt Creator: Using the Help Mode
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-quick-tour.html \externalpage https://doc.qt.io/qtcreator/creator-quick-tour.html
\title Qt Creator: User Interface \title Qt Creator: User Interface
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-modes.html \externalpage https://doc.qt.io/qtcreator/creator-modes.html
\title Qt Creator: Selecting Modes \title Qt Creator: Selecting Modes
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-sidebar-views.html \externalpage https://doc.qt.io/qtcreator/creator-sidebars.html
\title Qt Creator: Working with Sidebars
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-sidebar-views.html
\title Qt Creator: Browsing Project Contents \title Qt Creator: Browsing Project Contents
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-output-panes.html \externalpage https://doc.qt.io/qtcreator/creator-projects-view.html
\title Qt Creator: Projects
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-file-system-view.html
\title Qt Creator: File System
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-open-documents-view.html
\title Qt Creator: Open Documents
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-output-panes.html
\title Qt Creator: Viewing Output \title Qt Creator: Viewing Output
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-cli.html \externalpage https://doc.qt.io/qtcreator/creator-cli.html
\title Qt Creator: Using Command Line Options \title Qt Creator: Using Command Line Options
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-task-lists.html \externalpage https://doc.qt.io/qtcreator/creator-task-lists.html
\title Qt Creator: Showing Task List Files in Issues Pane \title Qt Creator: Showing Task List Files in Issues Pane
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-managing-sessions.html \externalpage https://doc.qt.io/qtcreator/creator-telemetry.html
\title Qt Creator: Managing Data Collection
*/
/*!
\externalpage https://doc.qt.io/qtcreator/collecting-usage-statistics.html
\title Qt Creator: Collecting Usage Statistics
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-project-managing-sessions.html
\title Qt Creator: Managing Sessions \title Qt Creator: Managing Sessions
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-external.html \externalpage https://doc.qt.io/qtcreator/creator-editor-external.html
\title Qt Creator: Using External Tools \title Qt Creator: Using External Tools
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-version-control.html \externalpage https://doc.qt.io/qtcreator/creator-version-control.html
\title Qt Creator: Using Version Control Systems \title Qt Creator: Using Version Control Systems
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-bazaar.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-bazaar.html
\title Qt Creator: Using Bazaar \title Qt Creator: Using Bazaar
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-clearcase.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-clearcase.html
\title Qt Creator: Using ClearCase \title Qt Creator: Using ClearCase
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-cvs.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-cvs.html
\title Qt Creator: Using CVS \title Qt Creator: Using CVS
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-git.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-git.html
\title Qt Creator: Using Git \title Qt Creator: Using Git
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-mercurial.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-mercurial.html
\title Qt Creator: Using Mercurial \title Qt Creator: Using Mercurial
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-perforce.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-perforce.html
\title Qt Creator: Using Perforce \title Qt Creator: Using Perforce
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-vcs-subversion.html \externalpage https://doc.qt.io/qtcreator/creator-vcs-subversion.html
\title Qt Creator: Using Subversion \title Qt Creator: Using Subversion
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html \externalpage https://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html
\title Qt Creator: Keyboard Shortcuts \title Qt Creator: Keyboard Shortcuts
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qmldesigner-pathview-editor.html \externalpage https://doc.qt.io/qtcreator/qtcreator-transitions-example.html
\title Qt Creator: Editing PathView Properties
*/
/*!
\externalpage http://doc.qt.io/qtcreator/qmldesigner-connections.html
\title Qt Creator: Adding Connections
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-signals.html
\title Qt Creator: Connecting Objects to Signals
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-dynamic-properties.html
\title Qt Creator: Specifying Dynamic Properties
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-property-bindings.html
\title Qt Creator: Adding Bindings Between Properties
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-connections-backend.html
\title Qt Creator: Managing C++ Backend Objects
*/
/*!
\externalpage http://doc.qt.io/qtcreator/qtcreator-transitions-example.html
\title Qt Creator: Creating a Qt Quick Application \title Qt Creator: Creating a Qt Quick Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qtquick-iso-icon-browser.html \externalpage https://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html
\title Qt Creator: Browsing ISO 7000 Icons
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-export-to-qml.html
\title Qt Creator: Exporting Designs from Graphics Software
*/
/*!
\externalpage http://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html
\title Qt Creator: Using QML Modules with Plugins \title Qt Creator: Using QML Modules with Plugins
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/quick-converting-ui-projects.html \externalpage https://doc.qt.io/qtcreator/quick-converting-ui-projects.html
\title Qt Creator: Converting UI Projects to Applications \title Qt Creator: Converting UI Projects to Applications
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-visual-editor.html \externalpage https://doc.qt.io/qtcreator/creator-visual-editor.html
\title Qt Creator: Developing Qt Quick Applications \title Qt Creator: Developing Qt Quick Applications
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-using-qt-quick-designer.html \externalpage https://doc.qt.io/qtcreator/quick-projects.html
\title Qt Creator: Editing QML Files in Design Mode
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-projects.html
\title Qt Creator: Creating Qt Quick Projects \title Qt Creator: Creating Qt Quick Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/quick-components.html \externalpage https://doc.qt.io/qtcreator/creator-qtquickdesigner-plugin.html
\title Qt Creator: Creating Components \title Qt Creator: Using Qt Quick Designer
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qt-quick-toolbars.html \externalpage https://doc.qt.io/qtcreator/qt-quick-toolbars.html
\title Qt Creator: Using Qt Quick Toolbars \title Qt Creator: Using Qt Quick Toolbars
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/quick-buttons.html \externalpage https://doc.qt.io/qtcreator/creator-editor-options.html
\title Qt Creator: Creating Buttons
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-scalable-image.html
\title Qt Creator: Creating Scalable Buttons and Borders
*/
/*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-options.html
\title Qt Creator: Configuring the Editor \title Qt Creator: Configuring the Editor
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-functions.html \externalpage https://doc.qt.io/qtcreator/creator-editor-functions.html
\title Qt Creator: Writing Code \title Qt Creator: Writing Code
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-coding-navigating.html \externalpage https://doc.qt.io/qtcreator/creator-coding-navigating.html
\title Qt Creator: Working in Edit Mode \title Qt Creator: Working in Edit Mode
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-highlighting.html \externalpage https://doc.qt.io/qtcreator/creator-highlighting.html
\title Qt Creator: Semantic Highlighting \title Qt Creator: Semantic Highlighting
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-checking-code-syntax.html \externalpage https://doc.qt.io/qtcreator/creator-checking-code-syntax.html
\title Qt Creator: Checking Code Syntax \title Qt Creator: Checking Code Syntax
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-completing-code.html \externalpage https://doc.qt.io/qtcreator/creator-completing-code.html
\title Qt Creator: Completing Code \title Qt Creator: Completing Code
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-codepasting.html \externalpage https://doc.qt.io/qtcreator/creator-editor-codepasting.html
\title Qt Creator: Pasting and Fetching Code Snippets \title Qt Creator: Pasting and Fetching Code Snippets
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-macros.html \externalpage https://doc.qt.io/qtcreator/creator-macros.html
\title Qt Creator: Using Text Editing Macros \title Qt Creator: Using Text Editing Macros
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-fakevim.html \externalpage https://doc.qt.io/qtcreator/creator-editor-fakevim.html
\title Qt Creator: Using FakeVim Mode \title Qt Creator: Using FakeVim Mode
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-indenting-code.html \externalpage https://doc.qt.io/qtcreator/creator-indenting-code.html
\title Qt Creator: Indenting Text or Code \title Qt Creator: Indenting Text or Code
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-finding.html \externalpage https://doc.qt.io/qtcreator/creator-editor-finding.html
\title Qt Creator: Finding and Replacing \title Qt Creator: Finding and Replacing
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-refactoring.html \externalpage https://doc.qt.io/qtcreator/creator-editor-refactoring.html
\title Qt Creator: Refactoring \title Qt Creator: Refactoring
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-locator.html \externalpage https://doc.qt.io/qtcreator/creator-editor-quick-fixes.html
\title Qt Creator: Applying Refactoring Actions
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-editor-locator.html
\title Qt Creator: Searching with the Locator \title Qt Creator: Searching with the Locator
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-coding.html \externalpage https://doc.qt.io/qtcreator/creator-coding.html
\title Qt Creator: Coding \title Qt Creator: Coding
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-options-text.html \externalpage https://doc.qt.io/qtcreator/creator-editor-options-text.html
\title Qt Creator: Specifying Text Editor Settings \title Qt Creator: Specifying Text Editor Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-finding-overview.html \externalpage https://doc.qt.io/qtcreator/creator-finding-overview.html
\title Qt Creator: Finding \title Qt Creator: Finding
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-mime-types.html \externalpage https://doc.qt.io/qtcreator/creator-mime-types.html
\title Qt Creator: Editing MIME Types \title Qt Creator: Editing MIME Types
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-modeling.html \externalpage https://doc.qt.io/qtcreator/creator-modeling.html
\title Qt Creator: Modeling \title Qt Creator: Modeling
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-qml-debugging-example.html \externalpage https://doc.qt.io/qtcreator/creator-qml-debugging-example.html
\title Qt Creator: Debugging a Qt Quick Example Application \title Qt Creator: Debugging a Qt Quick Example Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugging-example.html \externalpage https://doc.qt.io/qtcreator/creator-debugging-example.html
\title Qt Creator: Debugging a C++ Example Application \title Qt Creator: Debugging a C++ Example Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugger-engines.html \externalpage https://doc.qt.io/qtcreator/creator-debugger-engines.html
\title Qt Creator: Setting Up Debugger \title Qt Creator: Setting Up Debugger
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugging-qml.html \externalpage https://doc.qt.io/qtcreator/creator-debugging-qml.html
\title Qt Creator: Debugging Qt Quick Projects \title Qt Creator: Debugging Qt Quick Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugging.html \externalpage https://doc.qt.io/qtcreator/creator-debugging.html
\title Qt Creator: Debugging \title Qt Creator: Debugging
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugger-operating-modes.html \externalpage https://doc.qt.io/qtcreator/creator-debugger-operating-modes.html
\title Qt Creator: Launching the Debugger \title Qt Creator: Launching the Debugger
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debug-mode.html \externalpage https://doc.qt.io/qtcreator/creator-debug-mode.html
\title Qt Creator: Interacting with the Debugger \title Qt Creator: Interacting with the Debugger
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debugging-helpers.html \externalpage https://doc.qt.io/qtcreator/creator-debugging-helpers.html
\title Qt Creator: Using Debugging Helpers \title Qt Creator: Using Debugging Helpers
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-troubleshooting-debugging.html \externalpage https://doc.qt.io/qtcreator/creator-troubleshooting-debugging.html
\title Qt Creator: Troubleshooting Debugger \title Qt Creator: Troubleshooting Debugger
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/index.html \externalpage https://doc.qt.io/qtcreator/index.html
\title Qt Creator Manual \title Qt Creator Manual
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-advanced.html \externalpage https://doc.qt.io/qtcreator/creator-advanced.html
\title Qt Creator: Advanced Use \title Qt Creator: Advanced Use
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-os-supported-platforms.html \externalpage https://doc.qt.io/qtcreator/creator-os-supported-platforms.html
\title Qt Creator: Supported Platforms \title Qt Creator: Supported Platforms
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-connecting-mobile.html \externalpage https://doc.qt.io/qtcreator/creator-desktop-platforms.html
\title Qt Creator: Desktop Platforms
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-embedded-platforms.html
\title Qt Creator: Embedded Platforms
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-mobile-platforms.html
\title Qt Creator: Mobile Platforms
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-connecting-mobile.html
\title Qt Creator: Connecting Devices \title Qt Creator: Connecting Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-usability.html \externalpage https://doc.qt.io/qtcreator/creator-usability.html
\title Qt Creator: Optimizing Applications for Mobile Devices \title Qt Creator: Optimizing Applications for Mobile Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-acknowledgements.html \externalpage https://doc.qt.io/qtcreator/creator-acknowledgements.html
\title Qt Creator: Acknowledgements \title Qt Creator: Acknowledgements
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-help-overview.html \externalpage https://doc.qt.io/qtcreator/creator-help-overview.html
\title Qt Creator: Getting Help \title Qt Creator: Getting Help
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/technical-support.html \externalpage https://doc.qt.io/qtcreator/technical-support.html
\title Qt Creator: Technical Support \title Qt Creator: Technical Support
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-overview.html \externalpage https://doc.qt.io/qtcreator/creator-overview.html
\title Qt Creator: IDE Overview \title Qt Creator: IDE Overview
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-testing.html \externalpage https://doc.qt.io/qtcreator/creator-testing.html
\title Qt Creator: Testing \title Qt Creator: Testing
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-deployment.html \externalpage https://doc.qt.io/qtcreator/creator-deployment.html
\title Qt Creator: Deploying to Devices \title Qt Creator: Deploying to Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-tutorials.html \externalpage https://doc.qt.io/qtcreator/creator-tutorials.html
\title Qt Creator: Tutorials \title Qt Creator: Tutorials
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-known-issues.html \externalpage https://doc.qt.io/qtcreator/creator-known-issues.html
\title Qt Creator: Known Issues \title Qt Creator: Known Issues
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-design-mode.html \externalpage https://doc.qt.io/qtcreator/creator-design-mode.html
\title Qt Creator: Designing User Interfaces \title Qt Creator: Designing User Interfaces
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-glossary.html \externalpage https://doc.qt.io/qtcreator/creator-glossary.html
\title Qt Creator: Glossary \title Qt Creator: Glossary
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-getting-started.html \externalpage https://doc.qt.io/qtcreator/creator-getting-started.html
\title Qt Creator: Getting Started \title Qt Creator: Getting Started
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-analyzer.html \externalpage https://doc.qt.io/qtcreator/creator-analyzer.html
\title Qt Creator: Detecting Memory Leaks with Memcheck \title Qt Creator: Detecting Memory Leaks with Memcheck
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-cache-profiler.html \externalpage https://doc.qt.io/qtcreator/creator-cache-profiler.html
\title Qt Creator: Profiling Function Execution \title Qt Creator: Profiling Function Execution
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-running-valgrind-remotely.html \externalpage https://doc.qt.io/qtcreator/creator-running-valgrind-remotely.html
\title Qt Creator: Running Valgrind Tools on External Applications \title Qt Creator: Running Valgrind Tools on External Applications
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-valgrind-overview.html \externalpage https://doc.qt.io/qtcreator/creator-valgrind-overview.html
\title Qt Creator: Using Valgrind Code Analysis Tools \title Qt Creator: Using Valgrind Code Analysis Tools
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-analyze-mode.html \externalpage https://doc.qt.io/qtcreator/creator-analyze-mode.html
\title Qt Creator: Analyzing Code \title Qt Creator: Analyzing Code
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-qml-performance-monitor.html \externalpage https://doc.qt.io/qtcreator/creator-qml-performance-monitor.html
\title Qt Creator: Profiling QML Applications \title Qt Creator: Profiling QML Applications
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html \externalpage https://doc.qt.io/qtcreator/creator-deploying-android.html
\title Qt Creator: Deploying Applications to Android Devices \title Qt Creator: Deploying Applications to Android Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-developing-ios.html \externalpage https://doc.qt.io/qtcreator/creator-developing-ios.html
\title Qt Creator: Connecting iOS devices \title Qt Creator: Connecting iOS devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-developing-android.html \externalpage https://doc.qt.io/qtcreator/creator-developing-android.html
\title Qt Creator: Connecting Android Devices \title Qt Creator: Connecting Android Devices
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html \externalpage https://doc.qt.io/qtcreator/creator-build-example-application.html
\title Qt Creator: Building and Running an Example \title Qt Creator: Building and Running an Example
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-generic.html \externalpage https://doc.qt.io/qtcreator/creator-project-generic.html
\title Qt Creator: Setting Up a Generic Project \title Qt Creator: Setting Up a Generic Project
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-sharing-project-settings.html \externalpage https://doc.qt.io/qtcreator/creator-sharing-project-settings.html
\title Qt Creator: Sharing Project Settings \title Qt Creator: Sharing Project Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-opening.html \externalpage https://doc.qt.io/qtcreator/creator-project-opening.html
\title Qt Creator: Opening Projects \title Qt Creator: Opening Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-managing.html \externalpage https://doc.qt.io/qtcreator/creator-project-managing.html
\title Qt Creator: Managing Projects \title Qt Creator: Managing Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-cmake.html \externalpage https://doc.qt.io/qtcreator/creator-project-cmake.html
\title Qt Creator: Setting Up CMake \title Qt Creator: Setting Up CMake
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-targets.html \externalpage https://doc.qt.io/qtcreator/creator-targets.html
\title Qt Creator: Adding Kits \title Qt Creator: Adding Kits
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-tool-chains.html \externalpage https://doc.qt.io/qtcreator/creator-tool-chains.html
\title Qt Creator: Adding Compilers \title Qt Creator: Adding Compilers
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-qbs.html \externalpage https://doc.qt.io/qtcreator/creator-project-qbs.html
\title Qt Creator: Setting Up Qbs \title Qt Creator: Setting Up Qbs
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-creating.html \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html
\title Qt Creator: Creating Projects \title Qt Creator: Creating Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-wizards.html \externalpage https://doc.qt.io/qtcreator/creator-project-wizards.html
\title Qt Creator: Adding New Custom Wizards \title Qt Creator: Adding New Custom Wizards
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-wizards-json.html \externalpage https://doc.qt.io/qtcreator/creator-project-meson.html
\title Qt Creator: Adding JSON-Based Wizards \title Qt Creator: Setting Up Meson
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-wizards-xml.html \externalpage https://doc.qt.io/qtcreator/creator-project-nimble.html
\title Qt Creator: Adding XML-Based Wizards \title Qt Creator: Setting Up Nimble
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-projects-autotools.html \externalpage https://doc.qt.io/qtcreator/creator-project-incredibuild.html
\title Qt Creator: Setting Up IncrediBuild
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-project-conan.html
\title Qt Creator: Setting Up Conan
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-projects-autotools.html
\title Qt Creator: Setting Up an Autotools Project \title Qt Creator: Setting Up an Autotools Project
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-configuring-projects.html \externalpage https://doc.qt.io/qtcreator/creator-configuring-projects.html
\title Qt Creator: Configuring Projects \title Qt Creator: Configuring Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-build-process-customizing.html \externalpage https://doc.qt.io/qtcreator/creator-build-process-customizing.html
\title Qt Creator: Customizing the Build Process \title Qt Creator: Customizing the Build Process
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-build-settings.html \externalpage https://doc.qt.io/qtcreator/creator-build-settings.html
\title Qt Creator: Specifying Build Settings \title Qt Creator: Specifying Build Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-code-style-settings.html \externalpage https://doc.qt.io/qtcreator/creator-build-settings-cmake.html
\title Qt Creator: CMake Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-build-settings-qmake.html
\title Qt Creator: qmake Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-build-settings-qbs.html
\title Qt Creator: Qbs Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-build-settings-meson.html
\title Qt Creator: Meson Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-build-settings-incredibuild.html
\title Qt Creator: IncrediBuild Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-build-settings-conan.html
\title Qt Creator: Conan Build Configuration
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-code-style-settings.html
\title Qt Creator: Specifying Code Style Settings \title Qt Creator: Specifying Code Style Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-run-settings.html \externalpage https://doc.qt.io/qtcreator/creator-run-settings.html
\title Qt Creator: Specifying Run Settings \title Qt Creator: Specifying Run Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-qmake-libraries.html \externalpage https://doc.qt.io/qtcreator/creator-project-qmake-libraries.html
\title Qt Creator: Adding Libraries to Projects \title Qt Creator: Adding Libraries to Projects
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-other.html \externalpage https://doc.qt.io/qtcreator/creator-project-other.html
\title Qt Creator: Using Other Build Systems \title Qt Creator: Build Systems
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-running-targets.html \externalpage https://doc.qt.io/qtcreator/creator-running-targets.html
\title Qt Creator: Running on Multiple Platforms \title Qt Creator: Running on Multiple Platforms
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-build-dependencies.html \externalpage https://doc.qt.io/qtcreator/creator-build-dependencies.html
\title Qt Creator: Specifying Dependencies \title Qt Creator: Specifying Dependencies
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-building-running.html \externalpage https://doc.qt.io/qtcreator/creator-project-settings-environment.html
\title Qt Creator: Specifying Environment Settings
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-custom-output-parsers.html
\title Qt Creator: Using Custom Output Parsers
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-building-running.html
\title Qt Creator: Building and Running \title Qt Creator: Building and Running
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-editor-settings.html \externalpage https://doc.qt.io/qtcreator/creator-editor-settings.html
\title Qt Creator: Specifying Editor Settings \title Qt Creator: Specifying Editor Settings
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-qmake.html \externalpage https://doc.qt.io/qtcreator/creator-project-qmake.html
\title Qt Creator: Adding Qt Versions \title Qt Creator: Adding Qt Versions
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-building-targets.html \externalpage https://doc.qt.io/qtcreator/creator-building-targets.html
\title Qt Creator: Building for Multiple Platforms \title Qt Creator: Building for Multiple Platforms
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html \externalpage https://doc.qt.io/qtcreator/creator-using-qt-designer.html
\title Qt Creator: Developing Widget Based Applications \title Qt Creator: Developing Widget Based Applications
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-writing-program.html \externalpage https://doc.qt.io/qtcreator/creator-writing-program.html
\title Qt Creator: Creating a Qt Widget Based Application \title Qt Creator: Creating a Qt Widget Based Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/adding-plugins.html \externalpage https://doc.qt.io/qtcreator/adding-plugins.html
\title Qt Creator: Adding Qt Designer Plugins \title Qt Creator: Adding Qt Designer Plugins
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-configuring.html \externalpage https://doc.qt.io/qtcreator/creator-configuring.html
\title Qt Creator: Configuring Qt Creator \title Qt Creator: Configuring Qt Creator
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-debuggers.html \externalpage https://doc.qt.io/qtcreator/creator-debuggers.html
\title Qt Creator: Adding Debuggers \title Qt Creator: Adding Debuggers
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qt-creator-accelbubble-example.html \externalpage https://doc.qt.io/qtcreator/qtcreator-accelbubble-example.html
\title Qt Creator: Creating a Mobile Application \title Qt Creator: Creating a Mobile Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-diff-editor.html \externalpage https://doc.qt.io/qtcreator/creator-diff-editor.html
\title Qt Creator: Comparing Files \title Qt Creator: Comparing Files
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-beautifier.html \externalpage https://doc.qt.io/qtcreator/creator-beautifier.html
\title Qt Creator: Beautifying Source Code \title Qt Creator: Beautifying Source Code
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-clang-codemodel.html \externalpage https://doc.qt.io/qtcreator/creator-clang-codemodel.html
\title Qt Creator: Parsing C++ Files with the Clang Code Model \title Qt Creator: Parsing C++ Files with the Clang Code Model
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-quick-ui-forms.html \externalpage https://doc.qt.io/qtcreator/creator-quick-ui-forms.html
\title Qt Creator: Qt Quick UI Forms \title Qt Creator: UI Files
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-clang-tools.html \externalpage https://doc.qt.io/qtcreator/creator-clang-tools.html
\title Qt Creator: Using Clang Tools \title Qt Creator: Using Clang Tools
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-heob.html \externalpage https://doc.qt.io/qtcreator/creator-heob.html
\title Qt Creator: Detecting Memory Leaks with Heob \title Qt Creator: Detecting Memory Leaks with Heob
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-cpu-usage-analyzer.html \externalpage https://doc.qt.io/qtcreator/creator-cpu-usage-analyzer.html
\title Qt Creator: Analyzing CPU Usage \title Qt Creator: Analyzing CPU Usage
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-cppcheck.html \externalpage https://doc.qt.io/qtcreator/creator-cppcheck.html
\title Qt Creator: Analyzing Code with Cppcheck \title Qt Creator: Analyzing Code with Cppcheck
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-autotest.html \externalpage https://doc.qt.io/qtcreator/creator-ctf-visualizer.html
\title Qt Creator: Visualizing Chrome Trace Events
*/
/*!
\externalpage https://doc.qt.io/qtcreator/creator-autotest.html
\title Qt Creator: Running Autotests \title Qt Creator: Running Autotests
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-project-creating.html#creating-c-classes \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#creating-c-classes
\title Qt Creator: Creating C++ Classes \title Qt Creator: Creating C++ Classes
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-writing-program.html \externalpage https://doc.qt.io/qtcreator/creator-writing-program.html
\title Creating a Qt Widget Based Application \title Creating a Qt Widget Based Application
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qtquick-navigator.html \externalpage https://doc.qt.io/qtcreator/creator-scxml.html
\title Qt Creator: Managing Item Hierarchy
*/
/*!
\externalpage http://doc.qt.io/qtcreator/qtquick-properties.html
\title Qt Creator: Specifying Item Properties
*/
/*!
\externalpage http://doc.qt.io/qtcreator/quick-states.html
\title Qt Creator: Adding States
*/
/*!
\externalpage http://doc.qt.io/qtcreator/creator-scxml.html
\title Qt Creator: Editing State Charts \title Qt Creator: Editing State Charts
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/studio-timeline.html \externalpage https://doc.qt.io/qtcreator/creator-language-servers.html
\title Qt Creator: Creating Animations
*/
/*!
\externalpage http://doc.qt.io/qtcreator/creator-language-servers.html
\title Qt Creator: Using Language Servers \title Qt Creator: Using Language Servers
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/qtcreator-toc.html \externalpage https://doc.qt.io/qtcreator/qtcreator-toc.html
\title Qt Creator: All Topics \title Qt Creator: All Topics
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-live-preview.html \externalpage https://doc.qt.io/qtcreator/creator-live-preview.html
\title Qt Creator: Previewing \title Qt Creator: Validating with Target Hardware
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-live-preview-desktop.html \externalpage https://doc.qt.io/qtcreator/creator-live-preview-desktop.html
\title Qt Creator: Previewing on Desktop \title Qt Creator: Previewing on Desktop
*/ */
/*! /*!
\externalpage http://doc.qt.io/qtcreator/creator-live-preview-devices.html \externalpage https://doc.qt.io/qtcreator/creator-live-preview-devices.html
\title Qt Creator: Previewing on Devices \title Qt Creator: Previewing on Devices
*/ */
/*!
\externalpage https://doc.qt.io/qtcreator/qt-design-viewer.html
\title Qt Creator: Previewing in Browsers
*/

2
doc/global/html-footer-online.qdocconf
View File

@ -78,7 +78,7 @@ HTML.footer += \
" <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \ " <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \
" <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \ " <li id=\"menu-item-10375\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-10375\"><a href=\"mailto:feedback@theqtcompany.com?Subject=Feedback%20about%20doc.qt.io%20site\">Feedback</a></li>\n" \
" <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \ " <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \
" <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2020 The Qt Company</a></li>\n" \ " <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://qt.io/about-us/\">© 2022 The Qt Company</a></li>\n" \
" </ul>\n" \ " </ul>\n" \
"</div>\n" \ "</div>\n" \
"</div>\n" \ "</div>\n" \

2
doc/global/html-footer.qdocconf
View File

@ -8,7 +8,7 @@ HTML.footer = \
"</div>\n" \ "</div>\n" \
"<div class=\"footer\">\n" \ "<div class=\"footer\">\n" \
" <p>\n" \ " <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2020 The Qt Company Ltd.\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2022 The Qt Company Ltd.\n" \
" Documentation contributions included herein are the copyrights of\n" \ " Documentation contributions included herein are the copyrights of\n" \
" their respective owners.<br/>" \ " their respective owners.<br/>" \
" The documentation provided herein is licensed under the terms of the" \ " The documentation provided herein is licensed under the terms of the" \

3
doc/global/includes/standardpath/functiondocs.qdocinc
View File

@ -55,6 +55,9 @@
Returns the absolute file path to the executable, or an empty Returns the absolute file path to the executable, or an empty
string if not found. string if not found.
If the given \n executableName is an absolute path pointing to
an executable its clean path is returned.
//! [findExecutable] //! [findExecutable]
//! [locate] //! [locate]

2
doc/global/qt-module-defaults-online.qdocconf
View File

@ -5,7 +5,7 @@
HTML.footer = \ HTML.footer = \
" </div>\n" \ " </div>\n" \
" <p class=\"copy-notice\">\n" \ " <p class=\"copy-notice\">\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2020 The Qt Company Ltd.\n" \ " <acronym title=\"Copyright\">&copy;</acronym> 2022 The Qt Company Ltd.\n" \
" Documentation contributions included herein are the copyrights of\n" \ " Documentation contributions included herein are the copyrights of\n" \
" their respective owners. " \ " their respective owners. " \
" The documentation provided herein is licensed under the terms of the" \ " The documentation provided herein is licensed under the terms of the" \

2
doc/global/template/style/offline.css
View File

@ -145,7 +145,7 @@ Top navigation
display: block; display: block;
position: relative; position: relative;
text-align: right; text-align: right;
top: -47px; top: -30px;
float: right; float: right;
height: 20px; height: 20px;
z-index: 1; z-index: 1;

18
examples/widgets/graphicsview/chip/view.cpp
View File

@ -69,9 +69,9 @@ void GraphicsView::wheelEvent(QWheelEvent *e)
{ {
if (e->modifiers() & Qt::ControlModifier) { if (e->modifiers() & Qt::ControlModifier) {
if (e->angleDelta().y() > 0) if (e->angleDelta().y() > 0)
view->zoomIn(6); view->zoomInBy(6);
else else
view->zoomOut(6); view->zoomOutBy(6);
e->accept(); e->accept();
} else { } else {
QGraphicsView::wheelEvent(e); QGraphicsView::wheelEvent(e);
@ -274,12 +274,22 @@ void View::print()
#endif #endif
} }
void View::zoomIn(int level) void View::zoomIn()
{
zoomSlider->setValue(zoomSlider->value() + 1);
}
void View::zoomOut()
{
zoomSlider->setValue(zoomSlider->value() - 1);
}
void View::zoomInBy(int level)
{ {
zoomSlider->setValue(zoomSlider->value() + level); zoomSlider->setValue(zoomSlider->value() + level);
} }
void View::zoomOut(int level) void View::zoomOutBy(int level)
{ {
zoomSlider->setValue(zoomSlider->value() - level); zoomSlider->setValue(zoomSlider->value() - level);
} }

6
examples/widgets/graphicsview/chip/view.h
View File

@ -86,8 +86,10 @@ public:
QGraphicsView *view() const; QGraphicsView *view() const;
public slots: public slots:
void zoomIn(int level = 1); void zoomIn();
void zoomOut(int level = 1); void zoomOut();
void zoomInBy(int level);
void zoomOutBy(int level);
private slots: private slots:
void resetView(); void resetView();

2
examples/widgets/widgets/windowflags/previewwindow.cpp
View File

@ -124,6 +124,8 @@ void PreviewWindow::setWindowFlags(Qt::WindowFlags flags)
text += "\n| Qt::WindowShadeButtonHint"; text += "\n| Qt::WindowShadeButtonHint";
if (flags & Qt::WindowStaysOnTopHint) if (flags & Qt::WindowStaysOnTopHint)
text += "\n| Qt::WindowStaysOnTopHint"; text += "\n| Qt::WindowStaysOnTopHint";
if (flags & Qt::WindowStaysOnBottomHint)
text += "\n| Qt::WindowStaysOnBottomHint";
if (flags & Qt::CustomizeWindowHint) if (flags & Qt::CustomizeWindowHint)
text += "\n| Qt::CustomizeWindowHint"; text += "\n| Qt::CustomizeWindowHint";

0
include/QtAccessibilitySupport/5.15.8/QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h → include/QtAccessibilitySupport/5.15.10/QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h
View File

4
include/QtAccessibilitySupport/qtaccessibilitysupportversion.h
View File

@ -2,8 +2,8 @@
#ifndef QT_QTACCESSIBILITYSUPPORT_VERSION_H #ifndef QT_QTACCESSIBILITYSUPPORT_VERSION_H
#define QT_QTACCESSIBILITYSUPPORT_VERSION_H #define QT_QTACCESSIBILITYSUPPORT_VERSION_H
#define QTACCESSIBILITYSUPPORT_VERSION_STR "5.15.8" #define QTACCESSIBILITYSUPPORT_VERSION_STR "5.15.10"
#define QTACCESSIBILITYSUPPORT_VERSION 0x050F08 #define QTACCESSIBILITYSUPPORT_VERSION 0x050F0A
#endif // QT_QTACCESSIBILITYSUPPORT_VERSION_H #endif // QT_QTACCESSIBILITYSUPPORT_VERSION_H

0
include/QtClipboardSupport/5.15.8/QtClipboardSupport/private/qmacmime_p.h → include/QtClipboardSupport/5.15.10/QtClipboardSupport/private/qmacmime_p.h
View File

4
include/QtClipboardSupport/qtclipboardsupportversion.h
View File

@ -2,8 +2,8 @@
#ifndef QT_QTCLIPBOARDSUPPORT_VERSION_H #ifndef QT_QTCLIPBOARDSUPPORT_VERSION_H
#define QT_QTCLIPBOARDSUPPORT_VERSION_H #define QT_QTCLIPBOARDSUPPORT_VERSION_H
#define QTCLIPBOARDSUPPORT_VERSION_STR "5.15.8" #define QTCLIPBOARDSUPPORT_VERSION_STR "5.15.10"
#define QTCLIPBOARDSUPPORT_VERSION 0x050F08 #define QTCLIPBOARDSUPPORT_VERSION 0x050F0A
#endif // QT_QTCLIPBOARDSUPPORT_VERSION_H #endif // QT_QTCLIPBOARDSUPPORT_VERSION_H

4
include/QtConcurrent/qtconcurrentversion.h
View File

@ -2,8 +2,8 @@
#ifndef QT_QTCONCURRENT_VERSION_H #ifndef QT_QTCONCURRENT_VERSION_H
#define QT_QTCONCURRENT_VERSION_H #define QT_QTCONCURRENT_VERSION_H
#define QTCONCURRENT_VERSION_STR "5.15.8" #define QTCONCURRENT_VERSION_STR "5.15.10"
#define QTCONCURRENT_VERSION 0x050F08 #define QTCONCURRENT_VERSION 0x050F0A
#endif // QT_QTCONCURRENT_VERSION_H #endif // QT_QTCONCURRENT_VERSION_H

0
include/QtCore/5.15.8/QtCore/private/cp949codetbl_p.h → include/QtCore/5.15.10/QtCore/private/cp949codetbl_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/minimum-linux_p.h → include/QtCore/5.15.10/QtCore/private/minimum-linux_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstractanimation_p.h → include/QtCore/5.15.10/QtCore/private/qabstractanimation_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstracteventdispatcher_p.h → include/QtCore/5.15.10/QtCore/private/qabstracteventdispatcher_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstractfileengine_p.h → include/QtCore/5.15.10/QtCore/private/qabstractfileengine_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstractitemmodel_p.h → include/QtCore/5.15.10/QtCore/private/qabstractitemmodel_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstractproxymodel_p.h → include/QtCore/5.15.10/QtCore/private/qabstractproxymodel_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstractstate_p.h → include/QtCore/5.15.10/QtCore/private/qabstractstate_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qabstracttransition_p.h → include/QtCore/5.15.10/QtCore/private/qabstracttransition_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qanimationgroup_p.h → include/QtCore/5.15.10/QtCore/private/qanimationgroup_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbig5codec_p.h → include/QtCore/5.15.10/QtCore/private/qbig5codec_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbinaryjson_p.h → include/QtCore/5.15.10/QtCore/private/qbinaryjson_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbinaryjsonarray_p.h → include/QtCore/5.15.10/QtCore/private/qbinaryjsonarray_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbinaryjsonobject_p.h → include/QtCore/5.15.10/QtCore/private/qbinaryjsonobject_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbinaryjsonvalue_p.h → include/QtCore/5.15.10/QtCore/private/qbinaryjsonvalue_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbytearray_p.h → include/QtCore/5.15.10/QtCore/private/qbytearray_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qbytedata_p.h → include/QtCore/5.15.10/QtCore/private/qbytedata_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcalendarbackend_p.h → include/QtCore/5.15.10/QtCore/private/qcalendarbackend_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcalendarmath_p.h → include/QtCore/5.15.10/QtCore/private/qcalendarmath_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcborcommon_p.h → include/QtCore/5.15.10/QtCore/private/qcborcommon_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcborvalue_p.h → include/QtCore/5.15.10/QtCore/private/qcborvalue_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcfsocketnotifier_p.h → include/QtCore/5.15.10/QtCore/private/qcfsocketnotifier_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcollator_p.h → include/QtCore/5.15.10/QtCore/private/qcollator_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcore_mac_p.h → include/QtCore/5.15.10/QtCore/private/qcore_mac_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcore_unix_p.h → include/QtCore/5.15.10/QtCore/private/qcore_unix_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcoreapplication_p.h → include/QtCore/5.15.10/QtCore/private/qcoreapplication_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcorecmdlineargs_p.h → include/QtCore/5.15.10/QtCore/private/qcorecmdlineargs_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qcoreglobaldata_p.h → include/QtCore/5.15.10/QtCore/private/qcoreglobaldata_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdatastream_p.h → include/QtCore/5.15.10/QtCore/private/qdatastream_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdataurl_p.h → include/QtCore/5.15.10/QtCore/private/qdataurl_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdatetime_p.h → include/QtCore/5.15.10/QtCore/private/qdatetime_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdatetimeparser_p.h → include/QtCore/5.15.10/QtCore/private/qdatetimeparser_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdeadlinetimer_p.h → include/QtCore/5.15.10/QtCore/private/qdeadlinetimer_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdebug_p.h → include/QtCore/5.15.10/QtCore/private/qdebug_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdir_p.h → include/QtCore/5.15.10/QtCore/private/qdir_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qdoublescanprint_p.h → include/QtCore/5.15.10/QtCore/private/qdoublescanprint_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qduplicatetracker_p.h → include/QtCore/5.15.10/QtCore/private/qduplicatetracker_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qelfparser_p.h → include/QtCore/5.15.10/QtCore/private/qelfparser_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qendian_p.h → include/QtCore/5.15.10/QtCore/private/qendian_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeucjpcodec_p.h → include/QtCore/5.15.10/QtCore/private/qeucjpcodec_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeuckrcodec_p.h → include/QtCore/5.15.10/QtCore/private/qeuckrcodec_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventdispatcher_cf_p.h → include/QtCore/5.15.10/QtCore/private/qeventdispatcher_cf_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventdispatcher_glib_p.h → include/QtCore/5.15.10/QtCore/private/qeventdispatcher_glib_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventdispatcher_unix_p.h → include/QtCore/5.15.10/QtCore/private/qeventdispatcher_unix_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventdispatcher_win_p.h → include/QtCore/5.15.10/QtCore/private/qeventdispatcher_win_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventdispatcher_winrt_p.h → include/QtCore/5.15.10/QtCore/private/qeventdispatcher_winrt_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventloop_p.h → include/QtCore/5.15.10/QtCore/private/qeventloop_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qeventtransition_p.h → include/QtCore/5.15.10/QtCore/private/qeventtransition_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfactoryloader_p.h → include/QtCore/5.15.10/QtCore/private/qfactoryloader_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfile_p.h → include/QtCore/5.15.10/QtCore/private/qfile_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfiledevice_p.h → include/QtCore/5.15.10/QtCore/private/qfiledevice_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfileinfo_p.h → include/QtCore/5.15.10/QtCore/private/qfileinfo_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfileselector_p.h → include/QtCore/5.15.10/QtCore/private/qfileselector_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemengine_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemengine_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystementry_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystementry_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemiterator_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemiterator_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemmetadata_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemmetadata_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_fsevents_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_fsevents_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_inotify_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_inotify_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_kqueue_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_kqueue_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_polling_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_polling_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfilesystemwatcher_win_p.h → include/QtCore/5.15.10/QtCore/private/qfilesystemwatcher_win_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfinalstate_p.h → include/QtCore/5.15.10/QtCore/private/qfinalstate_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfreelist_p.h → include/QtCore/5.15.10/QtCore/private/qfreelist_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfsfileengine_iterator_p.h → include/QtCore/5.15.10/QtCore/private/qfsfileengine_iterator_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfsfileengine_p.h → include/QtCore/5.15.10/QtCore/private/qfsfileengine_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfunctions_fake_env_p.h → include/QtCore/5.15.10/QtCore/private/qfunctions_fake_env_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfunctions_p.h → include/QtCore/5.15.10/QtCore/private/qfunctions_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfutex_p.h → include/QtCore/5.15.10/QtCore/private/qfutex_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfutureinterface_p.h → include/QtCore/5.15.10/QtCore/private/qfutureinterface_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qfuturewatcher_p.h → include/QtCore/5.15.10/QtCore/private/qfuturewatcher_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qgb18030codec_p.h → include/QtCore/5.15.10/QtCore/private/qgb18030codec_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qglobal_p.h → include/QtCore/5.15.10/QtCore/private/qglobal_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qgregoriancalendar_p.h → include/QtCore/5.15.10/QtCore/private/qgregoriancalendar_p.h
View File

0
include/QtCore/5.15.8/QtCore/private/qharfbuzz_p.h → include/QtCore/5.15.10/QtCore/private/qharfbuzz_p.h
View File

Some files were not shown because too many files have changed in this diff Show More