aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
Commit message (Collapse)AuthorAgeFilesLines
* CMakePM: Update cmake conan for auto-setupCristian Adam2024-02-191-66/+177
| | | | | | | | | | Update to https://github.com/conan-io/cmake-conan/commit/ f6464d1e13ef7a47c569f5061f9607ea63339d39 Task-number: QTCREATORBUG-30169 Change-Id: Ibb8f3d353117c5c8ce21b8686cb6e2e5ee146698 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* CMakePM: Fix conan generators path using backslashesCristian Adam2024-02-091-0/+1
| | | | | | | | | | This can cause issues with CMake, since CMake uses slashes as directory separator. Fixes: QTCREATORBUG-30326 Change-Id: I0c03b3bcd32bddc99fb361eb8e6aaffd0b1f10b6 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Merge remote-tracking branch 'origin/12.0'Eike Ziller2024-01-101-3/+4
|\ | | | | | | Change-Id: I70bcac4195095a7646dcdc31532d8f61b643d869
| * Auto-Setup: Forward CMAKE_MSVC_RUNTIME_LIBRARY to package managerCristian Adam2024-01-091-3/+4
| | | | | | | | | | | | Fixes: QTCREATORBUG-30169 Change-Id: Icfbb497e067c5a5a4b57e91c9fa50bc0a2816bc3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Merge remote-tracking branch 'origin/12.0'Eike Ziller2024-01-081-33/+55
|\| | | | | | | | | | | | | | | Conflicts: src/libs/utils/treemodel.cpp src/libs/utils/treemodel.h Change-Id: I9c5e8ef77905745c201cfc647218c9e747d268d6
| * CMakePM: Fix Conan iOS/macOS package manager auto-setupCristian Adam2024-01-051-33/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_SYSROOT is used by Qt Creator for cross-compiling, and also selecting toolchain on macOS. Whilst for iOS CMAKE_OSX_SYSROOT is used for the same task. Make sure to pass these CMake variables to conan via the generated toolchain file. Qt Creator also uses for iOS the Xcode generator, which is a multi- configuration generator. This patchset will set the "Debug" and "Release" configurations that usually conan scripts use. Fixes: QTCREATORBUG-29978 Change-Id: I23c5d94f830aaf81c5d27f821c09545ddfd45df6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Move most acknowledgments to qt_attributions.jsonEike Ziller2023-12-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a qt_attributions.json and generate a documentation file from it automatically when building documentation. The result is included as a table in the acknowledgments page in the documentation. Some attributions cannot (yet) move to qt_attributions.json, because that requires the sources to be available in the project's source tree, which is not the case for LLVM, Clazy, etc. Remove the attributions from the README and instead point to the documentation from there, so we get rid of that duplication. Change-Id: I22623fe7495593ffce2e2c6c26255c27c5a8cb71 Reviewed-by: Kai Köhne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fonts: Add Medium SourceCodePro font variantsCristian Adam2023-12-042-0/+0
|/ | | | | | | | | | | | | | | | | | | Add the Medium font families. The Medium variants make sure that on a MacBook Pro with Retina display the font doesn't look out of place being too thin. Taken from https://github.com/adobe-fonts/source-code-pro/releases/tag/ 2.030R-ro%2F1.050R-it We need to stay with version 2.0.30 due to hinting on Windows, and to force QFont::Medium on macOS due to the fact that the medium font is not picked up. Newer versions like 2.0.42 do not have this issue. Task-number: QTCREATORBUG-29964 Change-Id: I4c0fba5730c4a6b869d900642b675698c29c6ae8 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMakePM: Detect C/C++ object extension for single source buildCristian Adam2023-11-051-0/+6
| | | | | | | | | | | | | | | When using CMake package manager auto-setup the CMAKE_C| XX_OUTPUT_EXTENSION is stored in the CMake cache. This way CMake project manager can know about the correct extension when building a single source file. If CMAKE_C|XX_OUTPUT_EXTENSION is not found in cache it will only use ".obj" for Clang-Cl/MSVC/MinGW toolchains. Task-number: QTCREATORBUG-27471 Change-Id: Ib9b75608d5a6834014150c57f3098f79284d8276 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CMakePM: Save CMAKE_MODULE|PREFIX_PATH in cache for vcpkgCristian Adam2023-10-191-0/+8
| | | | | | | | This would allow the user to see the paths set by vcpkg. Change-Id: I6d4ed9a9c69c2296851c8f8363b78d5adb7d2723 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMakePM: Save CMAKE_PREFIX|MODULE_PATH as cache variables for conanCristian Adam2023-10-191-0/+4
| | | | | | | | | This way it's visible in the project settings where the Conan paths are added. Change-Id: I95aa59c836bf3b9ed122e9bffdd61b0dd3c7354e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* vcpkg: Set VCPKG_ROOT environment variable for Qt Creator processCristian Adam2023-10-171-1/+1
| | | | | | | | This way CMakeProjectManager's auto-setup.cmake would pick it up and find vcpkg.exe Change-Id: Iafa84f13e0f50321ce771fc687ecc9e2df148de7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* CMakePM: Fix conan default profile auto-detectionCristian Adam2023-10-171-1/+1
| | | | | | | | CONAN_COMMAND was not available for `conan_profile_detect_default` function. Change-Id: I03df06aa88e6588101bb5ec54b3ce2cb64dee2c8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* PackageManager: Search for vcpkg in project rootMarcus Tillmanns2023-10-171-1/+1
| | | | | Change-Id: I467476e6897f36558afc76a262f631cdaa47320e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMakePM: Update CMake conan to latest versionCristian Adam2023-10-163-212/+549
| | | | | | | | | Url: https://github.com/conan-io/cmake-conan/blob/develop2/ conan_provider.cmake sha: 451fa97d2c59c07b13fb4812a64b2a6391f9e781 Change-Id: Ia52f5d856cf045d7a1d1871d6d43fd1d014439c4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Auto-setup: Forward CMAKE_<LANG>_STANDARD to conan/vcpkgv11.0.0-rc1Cristian Adam2023-07-041-0/+15
| | | | | | | Fixes: QTCREATORBUG-29292 Change-Id: Iee0b0639841d11fa14dcb57c1a4f9b4678aa0e2b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* External tools: Fall back to active project's QtEike Ziller2023-04-284-0/+4
| | | | | | | | | for the Qt related external tools, if there is no open document with a project. Change-Id: I1d059d70e5163921a8d98b6a93224aef1fbf1743 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* auto-setup: Add support for conan 2.0Cristian Adam2023-03-172-11/+249
| | | | | | Fixes: QTCREATORBUG-28865 Change-Id: Ifb801a458b4b18de218dee6604f0555cab13ec75 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* auto-setup: cleanup scriptCristian Adam2023-02-091-29/+20
| | | | | | | | | | | | | | | | Remove the Qt SDK detection of conan. This is no longer valid with the scripts being copied to ${buildDir}/.qtc/. Qt SDK also doesn't ship conan anymore. Do validation for conan via "conan --version" and vcpkg via "vcpkg version". For vcpkg the program path is resolved for symlinks and for Windows the target architecture is being detected from the compiler path. Change-Id: If0da79c952392d5ac9f8352e262b0802d6eb9ed3 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-067-7/+7
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/8.0'Eike Ziller2022-09-134-0/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: .github/workflows/build_cmake.yml src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp src/plugins/qmldesigner/components/materialeditor/materialeditorview.h src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp src/plugins/qmldesigner/designercore/model/model.cpp Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
| * Downgrade Source Code Pro fontDavid Schulz2022-09-124-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | The old version looks crisper. Downgrade to Roman fonts version 2.030 and Italic fonts version 1.050 Fixes: QTCREATORBUG-28106 Fixes: QTCREATORBUG-28139 Change-Id: Iec077fddf2ddba71b8b2cd7de92f397e12b6dc65 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Use SPDX license identifiersLucie Gérard2022-08-267-168/+14
|/ | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Update conan.cmake to version 0.18.1Cristian Adam2022-07-181-58/+411
| | | | | | | | | | This is the latest released version at this moment in time. It has support for Visual C++ 2022 detection. Fixes: QTCREATORBUG-27814 Change-Id: Ib4fa288ced1271e1964b2ae0f7d6a6c5e403cf53 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fonts: Provide bold italic fontChristian Stenger2022-04-194-0/+0
| | | | | | | | | | | | | | | | Linux fails to automatically mix bold and italic styles of fonts while other OS seem to be able to handle this appropriate. Provide a bold italic font to not rely on the underlying font engine. As on it update the other fonts to the same version. (Roman fonts version 2.038, Italic fonts version 1.058) Fixes: QTCREATORBUG-27355 Change-Id: I68884a11dd33c57372f946dbf9ee05f04b7ebc36 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* CMakePM: auto-setup.cmake do not fail if QtCreator.ini doesn't existCristian Adam2022-01-261-11/+13
| | | | | | | | | | There are Qt Creator installations that do not provide "QtProject/QtCreator.ini" file, and without it the auto-setup.cmake code would fail. Task-number: QTBUG-99273 Change-Id: I7674f68bc89375d8065d820b89650a358a7226b2 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Remove qmake build filesEike Ziller2022-01-202-37/+0
| | | | | | | | | | Removes qmake as a build system for building Qt Creator itself. Keep them for some tests that are not completely moved to CMake yet. Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* auto-setup.cmake: Add QT_CREATOR_CONAN_BUILD_POLICY cache variableCristian Adam2021-11-041-1/+11
| | | | | | | | | | By having QT_CREATOR_CONAN_BUILD_POLICY as a cache variable the users can change the default value of "missing" to something else like for example "never". Change-Id: I8b447c40d1331976d0ee35ecb34b4d68c5742771 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* auto-setup.cmake: warn if conan or vpkg executables are missingCristian Adam2021-09-071-0/+6
| | | | | | | | | | | Warn the user if the package manager auto-setup doesn't find conan or vcpkg executables and does nothing. Some projects will fail, or in the case of Qt modules, will continue working by using the system cmake packages. Change-Id: If3b07e619c27a4b637a894690bd248ad98d6dda2 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* auto-setup.cmake: Better handling of conan edgecasesCristian Adam2021-09-071-111/+129
| | | | | | | | | | | | | | | | | | | | | | Do not try to run the conan executable if conan executable is not found. If the conan auto-setup fails warn about it and provide the message how to skip the auto-setup configuration and do not fail due to the missing conan_paths.cmake file. Also print a status message that informs the user that the package manager auto-setup is performed, with the information how to skip the step. Task-number: QTCREATORBUG-25680 Fixes: QTCREATORBUG-25891 Fixes: QTCREATORBUG-25818 Change-Id: I0969ba9b417448f89efd22d7c361e3a54e552ed1 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alp Öz <aoz@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMakePM: Add variables to skip Qt Creator's package manager to cacheCristian Adam2021-08-201-0/+4
| | | | | | | | | | | | | | This way you will get the variables in the variables list and you only need to change them from OFF to ON. This won't fix the tasks below, but it will remove the lookup of the special variable names. Task-number: QTCREATORBUG-25680 Task-number: QTCREATORBUG-25891 Task-number: QTCREATORBUG-25972 Change-Id: I8ed1d5c4275516b10f4f10ad63b3de0f6b2ffbc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix executable path for QML utilityKai Köhne2021-08-191-1/+1
| | | | | | | | Amends 453f4996db44c80c8dfd Fixes: QTCREATORBUG-26137 Change-Id: Ic5c1688e8a11cffa10504026b303fb1e30a34fc4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMakePM: Reference more CMake variables in auto-setupCristian Adam2021-08-051-1/+5
| | | | | | | | | | This will remove the warnings for examples that setup only the C++ compiler, or when configuring QML debugging. Amends 1bf9900aedc3f47355ed88e2edf2b67b6562ce5a Change-Id: Ica9361114be420b81f611f5d498d87949399e8b4 Reviewed-by: hjk <hjk@qt.io>
* CMakePM: Remove QT_QMAKE_EXECUTABLE warningCristian Adam2021-08-021-0/+5
| | | | | | | | By referencing it in the auto-setup.cmake script. Fixes: QTCREATORBUG-26072 Change-Id: I8b2d06f08da96cfa498f818db4c2428702756516 Reviewed-by: hjk <hjk@qt.io>
* use "qml" as QML runtimeTim Jenssen2021-07-133-8/+7
| | | | | | | | | | | | | Since Qt 6.2 qmlscene is deprecated by Qt. This patch also removes QMLViewer as a last QtQuick 1 artifact in external tools. Task-number: QDS-639 Task-number: QDS-4535 Task-number: QTCREATORBUG-22385 Change-Id: I5f67040954f8ef438961f7166a53bd96d5b73f4d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMakePM: Fix conan compiler path setupCristian Adam2021-05-281-0/+2
| | | | | | | | | The conan toolchain.file was not passed to the cmake process that was setting up conan install, only inside for conan. Task-number: QTCREATORBUG-21785 Change-Id: I5f315e7de823d4ef3237081da9b294b236fedebb Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMakePM: Setup conan path from Qt SDKCristian Adam2021-04-221-0/+24
| | | | | | | | | Read and prepend the conan path from Qt SDK which is set in QtCreator.ini. Fixes: QTCREATORBUG-25553 Change-Id: I1404064ca253cb968d19bca253f1bb781209d0bd Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* qmake build system: Install share/3rdparty/package-managerAlessandro Portale2021-02-231-1/+2
| | | | | | | Amends: cc0fa86ffd6c202aeb7ee091bbf8a91d7623718c Change-Id: I00ca24fa18a10ff9bbbdeb86262c24c32d8dd8f8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMakeProjectManager: Add package manager auto-setupCristian Adam2021-02-193-3/+800
| | | | | | | | | | | | | | | | | | | | | | | Adds CMAKE_PROJECT_INCLUDE_BEFORE as initial CMake parameters with a path to a auto-setup.cmake script that will run conan install if a conanfile.txt is found in the prject. A project can have a local QtCreatorPackageManager.cmake file that will be loaded if exists. The auto setup can be controlled via the following CMake variables: * QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP * QT_CREATOR_SKIP_CONAN_SETUP * QT_CREATOR_SKIP_VCPKG_SETUP conan.cmake is taken from https://github.com/conan-io/cmake-conan which takes care of the conan specific compiler cruft. License is MIT. Fixes: QTCREATORBUG-25362 Change-Id: I70a6e1abc5600851d048f1590ca24204ce52a503 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectExplorer: Clean up variablesChristian Kandeler2020-10-024-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Global variables with names such as "CurrentProject*", "CurrentKit*" etc are harmful, because the term "current project" as used in Qt Creator does not refer to the "active project", but simply stands for the project that contains the node that is currently selected in the project tree, which in turn may or may not correspond to the current editor document, depending on the "sync with editor" setting. In other words, the "current project" is almost a random value with little meaning outside the project tree itself. Therefore, we remove "CurrentProject*" and friends, except the ones that are currently intentionally in use. The latter get renamed to "CurrentDocument:Project*", so their purpose becomes clear. Their old names are kept around for backward compatibility, but are not suggested by the variable chooser anymore, so new usages are unlikely and we can remove them at some point. We also add some ActiveProject* variants that have been requested in the past. Also remove the "CurrentSession" prefix that was deprecated six years ago. Fixes: QTCREATORBUG-12724 Fixes: QTCREATORBUG-24606 Change-Id: Ibba5d0e0ce3d2beb444a5eec01fbb9b745d90a1d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Fix copying of external toolsEike Ziller2020-08-191-6/+13
| | | | | | Fixes: QTCREATORBUG-24509 Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake: copy clang and resource files only if necessaryAlexis Murzeau2020-05-111-7/+3
| | | | | | | | | | | | | | | Uses a timestamp file in the build directory to detect when the input changes using DEPENDS from add_custom_command. Total copied files size sum up to more than 260 MB. This was copied at every incremental build, even if nothing changed. This leads to faster build, especially when the copied files are not cached in RAM or when not using a SSD. Change-Id: I3a0b691b961e1d8591068bacf40ae2467c8637cf Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake build: Copy fonts and syntax-highlighting files to builddirCristian Adam2019-06-131-0/+9
| | | | | | Fixes: QTCREATORBUG-22472 Change-Id: Ib812690c70efdc0ad7b125f6ce9623ca500d698d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Qt Creator CMake portCristian Adam2019-05-174-0/+20
| | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add Welcome Page of Qt Design StudioThomas Hartmann2019-03-066-0/+61
| | | | | | Change-Id: I492d27aa5f899630863eb902bf0acc9d9610b80e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* TextEditor: replace generic highlighter with ksyntaxhighlightingDavid Schulz2019-01-2819-14733/+0
| | | | | | Fixes: QTCREATORBUG-21029 Change-Id: I9894c4384e0e47da6bf030b7b8e07c3ad4737ff3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-11-199-323/+1193
|\ | | | | | | | | | | | | Conflicts: src/plugins/winrt/winrtdevicefactory.cpp Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5
| * GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2018-11-129-323/+1193
| | | | | | | | | | Change-Id: I0ec59359c7f8670a048dfc35264d6ab64bc62ceb Reviewed-by: David Schulz <david.schulz@qt.io>
* | Use build environment for lrelease and lupdate external toolsEike Ziller2018-09-262-2/+2
|/ | | | | | | Task-number: QTCREATORBUG-19892 Change-Id: Ic3316d51d7d5017aa413d6c910d3784a14237e9f Fixes: QTCREATORBUG-18394 Reviewed-by: hjk <hjk@qt.io>
* Revert "TextEditor: Ship generic Kate highlight definition for Python"Eike Ziller2018-09-111-686/+0
| | | | | | | | | | We ship the PythonEditor which does its own highlighting, so this is not needed for editing python. Users can still download it, but don't ship it with Qt Creator. This reverts commit e3d65fcf3f87806031f647da0da71675e1bc404f. Change-Id: I6c3650419f5ecd191c11dd2abb1bf30e16e4fc29 Reviewed-by: David Schulz <david.schulz@qt.io>