summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Improve examples CMakeLists.txtKai Köhne2022-03-1013-107/+33
| | | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Change-Id: Ifce5c3ebdc328269b491fa1e1e79e4cd5ef1f4db Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 2a1fe8400fb97308fe7e3eb70997c118e388a7ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix finding bundled svg with an in-tree examples buildAlexandru Croitor2022-03-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configure with -qt-zlib (like our Windows configs in CI) we create a QtZlibPrivate target and install it. QtSvg depends on this targets. When building examples in-tree (not as external projects) find_package(Qt6Svg) in the example projects will call find_dependency(Qt6Zlib). Currently that will fail with Found package configuration file: lib/cmake/Qt6ZlibPrivate/Qt6ZlibPrivateConfig.cmake but it set Qt6ZlibPrivate_FOUND to FALSE so package "Qt6ZlibPrivate" is considered to be NOT FOUND. Reason given by package: Target "Qt6::ZlibPrivate" was not found. Possibly due to QT_NO_CREATE_TARGETS being set to TRUE It's true, we set QT_NO_CREATE_TARGETS to FALSE when configuring examples, to prevent duplicate target creation. But the Zlib target was not created, because we didn't find_package it explicitly before configuring examples. Work around it by explicitly looking for the package before examples are built. Change-Id: If5c474d62a2939bc32373b2e92d3151f377f51bc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 71556f51d88199f1f5258a560d588df4d9aed7ca) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-03-071-1/+1
| | | | | Change-Id: I5d109a29473e2b75be90b8f91d3d005b5336169e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-03-041-1/+1
| | | | | Change-Id: Ief279475f3708fe55a64834583f94b5533629bff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-02-231-1/+1
| | | | | Change-Id: I29a065ae2468b48b89986e3fe6de712d788022ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-02-211-1/+1
| | | | | Change-Id: I0bd9419d985eba5768daed882208a23bf2d0696c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-02-161-1/+1
| | | | | Change-Id: Icfbfd4101dbac05d98b115d6294651555273ac4f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgv6.3.0-beta2Qt Submodule Update Bot2022-02-111-1/+1
| | | | | Change-Id: Icda9fdab11e0ab984815a5afc3b1c7f8e45a7195 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-02-081-1/+1
| | | | | Change-Id: I9bf8384633375f3c4b04d1d2692e2f46bff052f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgv6.3.0-beta1Qt Submodule Update Bot2022-01-311-1/+1
| | | | | Change-Id: If04377a70e673ab66bc1d26d2c38adb148a32f5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-251-1/+1
| | | | | Change-Id: I20ac9a2ba704d5611f9d21b04e5bc3af1daecfc2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-231-1/+1
| | | | | Change-Id: Iec11041dd0ff22662efd9d7037559c85afb30866 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Don't link Qt Svg against Qt WidgetsLars Knoll2022-01-211-9/+0
| | | | | | | | | | | This is a left-over from Qt 5 times, where we didn't have a separate Qt SvgWidgets module. Qt Svg doesn't depend on widgets and shouldn't link against it. Change-Id: Ibfcf15907e803be965554492c7dacc2a75fad1c8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fbdf33109cbcc1781b5e957926926a64454bccda) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-211-1/+1
| | | | | Change-Id: I5447b0bdc5e9827f623b9d25913b3b8ffe5063c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Adjust QSvgStyleSelector to change of virtual interface in qtbaseVolker Hilsheimer2022-01-201-1/+2
| | | | | | | | | | Follows up on qtbase:cb27ed30f7bc58474eba991f837843eb76cbd339. Task-number: QTBUG-99642 Change-Id: I94addd4467ab51697adac1042bdb15912930b539 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 43fb6953fb940edfec358a2d1c01e05705712829) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-201-1/+1
| | | | | Change-Id: Ida4b6d560ba8fb2f7bd25b80c9f1f294b32adc94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-171-1/+1
| | | | | Change-Id: I7d08753abff77b34f98d85a1a871071e7e20ef68 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix tst_qicon_svg, tst_qsvgplugin, tst_qsvgrenderer runtime failuresTatiana Borisova2022-01-137-4/+21
| | | | | | | | | | - add resources to binary for INTEGRITY (IGY is static build only) Task-number: QTBUG-99123 Change-Id: If33215406210bb84be3b526bdae9d88ff04170f0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit f35dab51d7f222c98717e0d31224a6cdabfe804d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-131-1/+1
| | | | | Change-Id: I1a9a01ace5b3ab52cc9607bb3d3398db4a329653 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgv6.3.0-alpha1Qt Submodule Update Bot2022-01-081-1/+1
| | | | | Change-Id: I62191b8380eb1d3c11bd0c8f6d83b33faa3dbb99 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2022-01-061-1/+1
| | | | | Change-Id: Id16ed898b2f56266087ab3ccd670a01c6783cf9b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Unconditionally stop parsing after the svg end tagEirik Aavitsland2022-01-051-3/+1
| | | | | | | | | | | | | | | | A QSvghandler may be created either with an external QXmlStreamReader object, or with a bytearray/iodevice, in which case it will create its own stream reader. The check to end parisng at the </svg> tag was active only in the first case. This could result in different behavior when reading an svg image from file vs. reading it from a bytearray or resource. Fixes: QTBUG-99407 Change-Id: I187b39256f2b16ea952a3ae1b77c067ff96e4155 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Robert Löhning <robert.loehning@qt.io> (cherry picked from commit 1749388cdc765fca4206aaf0f84ac9b0877dfc9a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2021-12-221-1/+1
| | | | | Change-Id: I006f09896be235610b6f6d7b7d99ed59a8de1e3c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtsvgQt Submodule Update Bot2021-12-171-1/+1
| | | | | Change-Id: Ia8b4d377d120e68b26417b07db21ae521ac66f60 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-131-1/+1
| | | | | Change-Id: I69cfabd22ad90754cace34974320edd31156f651 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-121-1/+1
| | | | | Change-Id: Ia3d1e965823b96d71f7901c8fdd258d213ba3050 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-121-1/+1
| | | | | Change-Id: I32259ef044d53d6c7dbf917dd5bbacb64fe55164 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-111-1/+1
| | | | | Change-Id: Iba90cdfc7fd857c494b87c75ac65b76fba28d01d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-101-1/+1
| | | | | Change-Id: I9995fd94992f3f3bebca34a828de21b82d22d7be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add BC file for 6.2.0Milla Pohjanheimo2021-12-081-0/+19463
| | | | | | | | | | Binary compatibility file added. Change-Id: I33b54245d412702c21f5fd8a03deeccd928d2a25 Pick-to: 6.2 Change-Id: I33b54245d412702c21f5fd8a03deeccd928d2a25 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-081-1/+1
| | | | | Change-Id: I46edf6ac1eac73f801ae9be632ceeef0f2d4c31e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-071-1/+1
| | | | | Change-Id: Ic8d184cf294bec16bb379357430a67fbb28a01fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-031-1/+1
| | | | | Change-Id: I5d6b6907f2361a937669a5aeee3f6fe76bfcc3b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-12-021-1/+1
| | | | | Change-Id: I7ed068fde2e2c4ac1d7a9a339a2176bf4302f817 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-291-1/+1
| | | | | Change-Id: Ia76ecc08cb599361fdbcd25a259d8070b1953b2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove unused license filesKai Köhne2021-11-263-1375/+0
| | | | | | | | These files are stale, and not referenced in the sources anymore. Pick-to: 6.2 Change-Id: I0ad38807700d2c8c88e316e240213bb109a49bfe Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-261-1/+1
| | | | | Change-Id: I1b8aecc10ada3c13e5bfa1b43dc50108a3086bf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-251-1/+1
| | | | | Change-Id: I0fb73c85f6ae02898e122a4219e6a199318a0f3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-241-1/+1
| | | | | Change-Id: I9c0aad0492cb2e670ac97622eea319562f176c63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-241-1/+1
| | | | | Change-Id: Ia9c12e6aca95f16fe2292df356ba9602255166a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-231-1/+1
| | | | | Change-Id: I501d54ee24d514d29d67ff3301ff281e921f42cb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-231-1/+1
| | | | | Change-Id: I77b0243c98a6814e22824426cb1878cbcccfb38f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-221-1/+1
| | | | | Change-Id: I157cc293e34d20db6a225a28a85580e72d2daceb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-201-1/+1
| | | | | Change-Id: I084f88deff462587d85be458731692244a813d3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-201-1/+1
| | | | | Change-Id: Ie06fc1529181038fc704317c7fa8d4e05f9cbaec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-191-1/+1
| | | | | Change-Id: If1fb67d93d5d57efe6dec19a64320f5a1e3143b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-191-1/+1
| | | | | Change-Id: I90431741988565d07e1e2ade83d0f19b9800a2ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix boundsOnElement() for text nodes having transformationsEirik Aavitsland2021-11-192-2/+8
| | | | | | | | | | Text layout calculations are done with a local scaling, and that was mixed up with the node transformation when computing the bounds. Fixes: QTBUG-98139 Pick-to: 6.2 Change-Id: Id3ab0500cfba4578989b5766677a53340e8cecde Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-181-1/+1
| | | | | Change-Id: I77265a3f0913e6504629e60d529167356e1335cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtsvgQt Submodule Update Bot2021-11-181-1/+1
| | | | | Change-Id: I0e0c93ee438ce95994dede921edb350a1113ee0a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status