| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 6.5.8-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Ic91e9ca9e5c969eb3c8ecad485b4430e423125aa
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDoc in Qt 6.7 will require complete function signatures in \fn commands,
including return values.
Change-Id: Ib96908eff9e5c317fcb2bfe72f138a93fe71af14
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit a57faeb035898301e361fa4825a545fea42f9374)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 136d3428fad829f87ef086436686d1e42fd2a970)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The documentation incorrectly specified the annotation as 'defaultApplicationMode' instead of 'defaultServerMode' for config_simulator.defaultServerMode. This commit corrects the annotation to reflect the proper name, ensuring consistency with the intended configuration.
Task-number: QTBUG-130082
Change-Id: I057f4daec569f99a7bcdc897b502d896ebce6053
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 12de196d75134fa8695dc974d4c519e0f498a720)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit bc3cd86669c1d42845798c07ba9020dca9c40964)
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 6.5.7-lts release
Conflicts solved:
dependencies.yaml
src/tools/ifcodegen/verify_generator.py
Note: the file under src/tools/.. was removed in the
commit 08e3f66aaba3376a2d4c92ed00a1e3322ea479ca.
Change-Id: I21a6394c6349d589013a0f34c9b6b391ca40bf64
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
\keyword need to be used instead of \target to make the versioned cmake
macros also show up in the qhp files and be supported in QC as well.
Change-Id: Ibf0f9dfb458312ebfe42671aefa630759f2fe9c7
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 434fcc2fc260a6aed0f426188f5190b67a6dc30a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit bf796bc3ca19532b8aac36b0f22c9003aa204e84)
(cherry picked from commit 08ef4bf8df380aeaedfdcb107673cdff5ced8d06)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pick-to: 6.2
Change-Id: I88223dbbd85a6bcfd8f14323ee884dd435d5c7a8
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 4a45970fd14dace404fe682e7c56890fb1680fb7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 1e773b71e6963ec39c83358f0e38f5d588cac207)
(cherry picked from commit 135a2f7a36179e28118b65d629e14d92d6f7d841)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All QML_VALUE_TYPES need to start lowercase
Change-Id: I4a8b37229b0bb30595bcf4db25210cd5b8fb6e4f
Reviewed-by: Soheil Armin <soheil.armin@qt.io>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
(cherry picked from commit fdf227544748c2c0326a14b7a430a3bd173a55f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8a82662c2fa29e70d46a8d53c6b07d4fd4db8ff5)
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ff08176a9e0dc24b88d7b67f9ed1615f2fe0bc86)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This selfcheck mode creates a small qface file and a minimal template
inside a temp folder and runs the generator.
In case the generation fails a error message is shown to help the
developers to identify the problem and how to workaround it.
The new selfcheck is automatically executed after building ifcodegen.
Pick-to: 6.2
Change-Id: I04838f14908de3a175aecf38d6a80e48fa33f891
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 1381b4d871fd5d8d07d0fbe6569fa7b72e2e17c1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a467bd8083a69a375963b8129308578ecba93eec)
(cherry picked from commit 0abfbee8f4739a261b6684cdab909fa141631201)
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Register QList<QIfServiceObject*> as a container for QML
* Register QIfServiceHandle as a QML value type
* Register generated structs as QML value type
Change-Id: I2bc75be08521d6428c3e83fe1629879e79efae60
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 04933fcf676573ad6b78e562958192da3e66d9d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 44c1a558831154b9f5b5edb0b63b1af3545677e5)
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 4ae7931b59e1d63e0165336e38b1324133080ed9)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Id45dbb13fc7fa9256fce9446ece4e90c8f80b3c5
Pick-to: 6.2
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 1f68dfa8580f2c176d23e478f9dd2c063756d4a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 99ab79d68f474bbb61820707e15122442cb7b32f)
(cherry picked from commit 10afd6a77a41b86cf3ef22ac508c63bcba6f648b)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Link against QtQmlModels to resolve QModelIndex related type errors
* Add a dependency towards QtQuick
* Register the QIfServiceObject type
Change-Id: I76e8cb3d6d7528e1147db0bb4bfda41bfd49cfaf
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit d3ba06a323153b54e4d20543eefc8d5fd1c96562)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9e71c9325151e4b98ceaa9af84c35d4017406acf)
(cherry picked from commit c1e6bb12d30bfcd1e8fc4107e0920589962a541f)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I6b24049df326be28b7a898a42ff2f72a51a61522
Fixes: QTBUG-127627
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 02c99f5817f899c9b5c63718e2c6d35d9aad5ca1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit c6699658c95b13f8ff960123ccabfd4eb1a62086)
(cherry picked from commit 4ca950d8baf284dd859628d2914d76ea4f5a0a72)
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ifc2e43710f254b6d0e747e9c97f920c5769b4c76
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 90beb48a46cf88f6f9361a1a333a79c323095d88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7d10046ede4401794aeeb84a4a86fa18def7c841)
(cherry picked from commit f236943c77146442b7a48c257f0f09d527e0c842)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I5f773b9026ec2b183f25d403e6bfba04ba99ff4f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 5622d9bceaacf4e0bc97cf374df4e57c3422b65d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2f898212a9ae9bbdf3c0777690ad02b1d19b8929)
(cherry picked from commit 07ecf92a055d99fe502e55130e5abe30496e75a1)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I7a6c40dfff782793a2b204a5f3bcef827e58d703
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 9b238fa0e58a62006138c276da1c7562f33671fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 571f300c56e635e566fc5d80992f5659cc7adf80)
(cherry picked from commit 5a23c358c902d6ff323978e3b9ca0f926cbd67bb)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ib8f0f4796401bd3ef1ec6162ca861efc6ce0889f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit f2704546ce1635b9798a1fd5eb6a6b8ad5186104)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0faab220443304690dd8d16d2a5e30c89e1cc3be)
(cherry picked from commit 77a7c2ed221a591fa14d983c4d4d122b5d7cd5dd)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The implementation of the Q_DECLARE_LOGGING_CATEGORY macro changed
causing export macros written preceding it failing. Using of the
Q_DECLARE_EXPORTED_LOGGING_CATEGORY macro is required instead.
Change-Id: I2ac56aa0794602cbbab5ad3ebbeb75eb334c2def
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 808f76745976f8fd679f1ed748585002bb4890ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2f7cf3d61fd87dda8a43cf265ce74c3d0ac58a9a)
(cherry picked from commit 6c048d33fdfb44385c55c2d8b412cc1d575507f4)
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 6.5.5-lts release
Conflicts solved:
dependencies.yaml
src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/qmlplugin/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl
Change-Id: I3018daf9098a16ff792f74df3be464e7e1865b2e
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pick-to: 6.2
Change-Id: I7095ffb9fc26dc6d74b11cf22d73c8cd844a1dcd
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 9b8124a418f5ac902133652e877181ae414687d9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e7b6fab4743cfec4734fa53207ef878906e11aee)
(cherry picked from commit e96ec076adeeb2ce9e72160f85430129afd21ca7)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pick-to: 6.2
Change-Id: Ie562dbd37817ea252a36e48317bc2840d75a363f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 7273f629c4347e721f6086a46beade932bd6064d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d101de0a8ee32b720618b6dcddee33ab3e1510ac)
(cherry picked from commit b0fc4fec52d9d389f0c157d0eab88a772d535e25)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-121740
Fixes: QTBUG-121778
Change-Id: Ia165a8a95a67f8a47d5f17380d2ae888cdf2d6da
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit d07deb8ba903e748dee7240b5ef6f0129eb4018d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0d8f9baa8292f85cca4ee200152b4e5832329613)
(cherry picked from commit 6c7476c9a2877000f22d6f533a0bb8bb7ea3eb39)
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-121800
Change-Id: I81325b61d9436393fbb21b56d97e167b48d552fa
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 1a737fddd47ee1d6ebc1e78bd0b985f10a310565)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b17d75cd64c11c60029b59bad438bbfa2444d172)
(cherry picked from commit 3a92c53b71e784bce383fe8ffdd43d706fde2f89)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-121696
Change-Id: Iaccd3adc1b4f12d6406ba6fed36328e2547dea71
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 4ea59246e26d775294124d66bfc52326cba0c7f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7288ee5b66f10ef45333b2c05b5eb0e2cfa081e3)
(cherry picked from commit efea19a7a6c9151b0ee2eef669f44e0453d6f28e)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Pick-to: 6.2
Fixes: QTBUG-122036
Change-Id: I71d584707e32c8d53dbb8e3024be64125a2e0572
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 6f5cae4c83c1c21826c1e4936df5c6ffa480f807)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 549f6bd9118227b96596ad0a9db4c534e26e02b9)
(cherry picked from commit 00d26716f8dddbc3b2a0e035d7d391bfcfc94ac9)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I46cace14654cfb679457d427df029752d95d2dcc
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 154cbc4344f102fb58d1ffa294f40de8e38932c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2fa4f9f50a627504963e32df1807b143b8773e45)
(cherry picked from commit 545a0a78943f2988a838160b5847a8411575fcde)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 4c3985e3c2665ef5ec06048783c6b004dc2b872e.
Reason for revert: The SPDX-License-Identifier should not be changed in the build files. In tqtc-qtinterfaceframework, the original identifier was 'LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0' instead of 'BSD-3-Clause'.
Change-Id: I1d790cd502f4ca943ddffd17d876d4a7df448106
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 42cf16938f773db6e29ec7d52f4b0f7d2ff0eb6d.
Revert of commercial SPDX license identifiers is required for the
Qt 6.5.x opensource releases, Qt 6.5.4 onwards.
Change-Id: Ic888e6ebad8f3a943eb984548e0f586a03de392f
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| |/
|
|
|
|
|
|
|
| |
This reverts commit 4c3985e3c2665ef5ec06048783c6b004dc2b872e.
Reason for revert: The SPDX-License-Identifier should not be changed in the build files. In tqtc-qtinterfaceframework, the original identifier was 'LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0' instead of 'BSD-3-Clause'.
Change-Id: I3315d39c8ac2a9f9102d145a1aac52036b4ca591
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| |
|
|
|
|
|
|
|
| |
The build files should not include a commercial SPDX-License-Identifier.
Instead, a BSD-3-Clause license identifier is used.
Task-number: QTQAINFRA-5900
Change-Id: I8ca27ceb032e946f5fbe86535a48333fb0a800c4
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Updated the commercial SPDX-License-Identifier to
the files in tqtc-qtinterfaceframework. Examples, tests, or
documentation files are not updated.
Task-number: QTQAINFRA-5900
Change-Id: I2b75bd39661da87e7650353fdde145d2c1750887
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Add documentation for QIfPagingModelInterface and
QIfFilterAndBrowseModelInterface.
Change-Id: Idd6d258974ebc92e23b5dfbf564f7a73f866e60e
Reviewed-by: Maycon Stamboroski <maycon.stamboroski@qt.io>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit e40d0667ccb0ee5092b242ea089aead2d180f8c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit eb550104757c6e1f30af908f6efba2b73ab27c84)
|
| |
|
|
|
|
|
|
|
|
| |
Also fixed some typos and linking errors
Change-Id: I200bc0c6e1578a84eea8f9d901e1e5f1fc50d2e3
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 9c4b8e84c05deda94c1334e8d98e88632c884d6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e843979769f6298cc11c1293c759c03f66e38d2e)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add #includes for QIfClimateControlBackendInterface and
QIfWindowControlBackendInterface to the documentation-specific master
header - this fixes multiple 'clang couldn't find function' warnings
when generating docs.
In addition, fix the following warnings:
* cmake-macros.qdoc:25: Unknown macro 'c'
* filter-reference.qdoc:6: Can't link to 'namespace_prefix'
* filter-reference.qdoc:6: Can't link to 'add_namespace_prefix'
* generator-usage.qdoc:5: Can't link to 'server_qtro_simulator'
Change-Id: I522f6905d51cf43135609585232796803dcc4141
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit eebce16932bb17858e54f8a73fc4aef318cdffda)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
When cross-compiling using a yocto SDK, find_package returns the
target interpreter, which is incompatible.
We need to explicitly search in the host sysroot for the python
interpreter.
Fixes: QTBUG-116662
Change-Id: Ia24a73ea3117cf38f930455a0758b17d3b86dff5
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
(cherry picked from commit e8c748e5f72848121358a0ae6896a4cb577015d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
| |
Fixes: QTBUG-115600
Change-Id: I5d8f29891f9ce010eb3ff2ba4751f131ed8d7aa4
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 7f674969a4dbc9b24ae436cd90149e5a64ac9b36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
| |
Change-Id: I2e2798461f53556a449ae6887bd8f099c4965e6b
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 997bd55e1f3a79757ac9f735368a00a3a28fe738)
|
| |
|
|
|
|
|
| |
Change-Id: Iecb969220e4d8dd9426912dd95221e6e94b5432b
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 5f520911a346a249fb7ec3d0551a7a1204fd394b)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
| |
|
|
|
|
|
| |
Change-Id: I184aef85f245f012aa8858fcf7c886996ba29af9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 2b58dce19a4433613a76bc0c03200c56296ca815)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Instead of relying on QVariant::canConvert(), do the conversion and
check for it's correctness.
This also updates the autotest accordingly.
Change-Id: If1b5c7e1702b53a16f380b81a5a9550384cc1c33
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 41a1693b379a384e1da5625e5b3cb9f6befa4dae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
| |
The generated code needs to use the current zone in order to read the
correct constraint from the simulation data.
Change-Id: Ia1a22f6cc7159c2349e0640677068e0f334b3eed
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit dd5b05b95ffa6d13b3373ad5ae45ea4b8302985b)
|
| |
|
|
|
|
|
|
|
|
| |
Forwarding the signal emitted in the QML simulation to the actual
instance didn't work correctly in all circumstances.
Change-Id: I3300200bf4c3354e06903cc7265dced2c7de4e83
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 92ecb5ceeccbec54c80c014ea77f2c9d378ec4ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
| |
A \target directly after a \row is generated as a <span> within a <tr>.
This is invalid HTML, so these link targets are relocated to the start
of the table by both Chrome and Firefox.
Change-Id: I3933e875007fc499166f65112214320aa580bdde
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 4fd79da47af9d0cd0642c6d9e8aef05e57ba5646)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
For autotests we support unloading all our backends.
Unloading plugins can lead to various errors. Instead of really
unloading the plugin, just destroy the plugin instances, the
actual plugin and all it libraries will stay loaded.
Change-Id: Ie4429ee8c7958cdff6ceb82cf5e587f6a2a398a0
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 3ac2448d1470cc0b52433bfc3d6541710af79bb2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
| |
Fixes: QTBUG-114940
Change-Id: Ib3bae0c0d87677e0edc356e5e7dc872fed14eb3e
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 90a5353efddd7b46ada7f5ebbc2faf7024215052)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The configurationId annotation documenation had some short comings.
It now should give you some more help were it can be used and what the
default value is.
The QtRO related serviceSettings now use a complete QML example.
The InterfaceFrameworkConfiguration documentation now also provides
a example on how serviceSettings can be used.
Change-Id: I5349efdc6b03952e395b506523bd1e1872302158
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 2ccb194294eb5ef662c5eea08e81a3b47e2c14e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
ARG_PREFIX can be non-set so the default value is set to VAR_PREFIX.
We should use it when filtering header files and setting the
GENERATED property.
Amends: ed930aa68c3dc0c3cf0a837ae8b544a8b9fc110e
Task-number: QTBUG-112684
Change-Id: Ie7946115f7d02e6a3a3b3037bf30b039466c4867
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 67493b0ef4d756cf8cd447ef6bbffc53f1f75cc0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
The property is used in the Qt build system internal functionality to
detect the generated files and apply the required postprocessing.
This also could be useful for user projects.
Fixes: QTBUG-112684
Change-Id: Id265b5f4b194a79d4daa9c09461f2a48a4118d70
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ed930aa68c3dc0c3cf0a837ae8b544a8b9fc110e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
| |
Change-Id: Icf3fe3cda8cf64cec4d1c1cf1543af24638b734f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit d0088967c3fd286e2cd7a5f6efd085899ca3525e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
- re is not just re.py anymore
- libssl is not a hard dependency anymore
- the lib64 directory may not even be there to begin with
Change-Id: I945f8edbb11f58278b42a6893214ff82e4f882fb
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 3ae219138f3b5bd0ec2b122bb3a19bd2cf0b358b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Also copy the python.exe from the original installation into the
virtualenv. The python.exe created by virtualenv seems to be
special wrapper, which always forwards to the original installation.
Fixes: QAA-1724
Change-Id: I7b175fc8416a895f4edc933adba6dd32f2985b87
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 85166a8fcd8e46eb3129192bc3d35c5273e52474)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|