summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flagsOtto Ryynänen2018-01-201-1/+1
| | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8406e959fdf1c8d9efebbbe53f1a391fa25f336a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* fix example source installation of qrc/rc files in subdirsOswald Buddenhagen2018-01-181-6/+12
| | | | | | | | | | such a project structure violates the assumption that the referenced resources are specified relative to the sub-project root, so we must resolve them to absolute paths manually. Task-number: QTBUG-65753 Change-Id: I8bcd5c6e7d7c6a713e5fcd3668be7d2f23169501 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* use correct path separators when invoking testcases on windowsOswald Buddenhagen2018-01-181-1/+1
| | | | | | Change-Id: Iad541f0d62ffdb2751da6225b9d40229d7d9a03f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* qmake: ignore QT if we have failed requires()Oswald Buddenhagen2018-01-121-0/+4
| | | | | | | | | otherwise the project would need to clear QT despite using qtHaveModule() in requires() (or REQUIRES=). Task-number: QTBUG-65106 Change-Id: I568202214c8eafcdbe2d0e253b18f0e171293aff Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: set COPY_PHASE_STRIP to NO in Xcode generatorJake Petroules2018-01-051-0/+4
| | | | | | | | | | | | | Since Xcode 6.3, this must be set to NO because stripping on copy is no longer fully supported due to the potential of input binaries being code signed. In this case Xcode will simply ignore the strip step and issue a warning since stripping would invalidate the code signature. This change silences that annoying warning for release builds. Also, the setting assignment is moved from being hardcoded in the generator, to a QMAKE_MAC_XCODE_SETTINGS value. Change-Id: If25511edddc12b7b0407e2992d80884b7d6437dc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Fix an issue causing asset catalogs to be miscompiled with iOS simulatorJake Petroules2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | This works around the inability to build iOS apps for a "generic" simulator by explicitly setting the Xcode build setting ENABLE_ONLY_ACTIVE_RESOURCES to NO in order to ensure that all variants of assets in an asset catalog are built when targeting iOS simulator devices. Otherwise, we will simply build for whatever the first simulator in the list happens to be. If the application is then deployed to a different simulator, some of the assets needed for that device variant may be missing. This "helps" QTCREATORBUG-19447 but is not a workaround since this fix is necessary for command line builds anyways, even though it's unlikely to crop up in practice there, since one would have to manually deploy the built application bundle to the simulator using simctl rather than going through Xcode (which would rebuild for the appropriate device). Change-Id: Ia41c48dcc715fe79a2c50db66a0ca7a1fea159c2 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: during early setup, skip all of default_pre.prfOswald Buddenhagen2017-12-142-3/+3
| | | | | | | | | | ... instead of only toolchain.prf. the license check could go haywire, and everything else that file does is meaningless in configure context anyway. Task-number: QTBUG-63452 Change-Id: I5e31c87fe717fda40978c0317556070637e537e2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: print compiler output if detection phase failsOswald Buddenhagen2017-12-141-5/+11
| | | | | | | helps enormously with debugging. Change-Id: Ic8876e74a4dbb14006d8b48658eb141a3f0e0fbf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* unbreak plugin dependency trackingOswald Buddenhagen2017-12-141-1/+1
| | | | | | | | use the correct operator. amends 623b191c10. Change-Id: Ice8b2a82b1c7828587cccc7d464f9313e176d536 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* configure: make cached results immediately availableOswald Buddenhagen2017-12-141-1/+6
| | | | | | | otherwise test de-duplication between modules doesn't work. Change-Id: I2c6222d853108df223758aa8907dc8d004efd87f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: support discarding selected test results with -recheckOswald Buddenhagen2017-12-142-2/+16
| | | | | | | | | especially during debugging, it is often necessary to re-run only one (or a few) tests, where -recheck-all would be wasteful. Task-number: QTBUG-64059 Change-Id: I9410894dec4289ff832d7f75e04f9b60fe76c57c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: reset *_LIBS when *_LIBS_{DEBUG|RELEASE} are specifiedOswald Buddenhagen2017-11-301-6/+9
| | | | | | | | | | | it could be somewhat surprising that specifying variant-specific libs would not clear the common libs, so do that. of course, the default for the common libs could theoretically contain common deps of the variant-specific libs, in which case clearing them would be surprising in turn - luckily, we have no such case. Change-Id: Ifca08b9e1949c6a0cefed6931ade4021927d7c90 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: make *_LIBS_{DEBUG|RELEASE} always workOswald Buddenhagen2017-11-301-4/+8
| | | | | | | ... and not only when the source explicitly specifies build variants. Change-Id: Iac6c8fda8f431d5fb50fada8338d1b660ab040d7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: fix over-quoting in library exportingOswald Buddenhagen2017-11-301-3/+4
| | | | | | | | | | | | unlike for the other fields, we forgot to eval() the values of the build-specific library values, leading to over-quoting of values which require any quoting at all. amends c0cc50520. Task-number: QTBUG-62521 Change-Id: I4dfce31040dd09248d3f9dd4294f7fb147c13bdd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: fix processing of *_LIBS_{DEBUG|RELEASE}= argsOswald Buddenhagen2017-11-301-2/+2
| | | | | | | | | | | | qtConfLibrary_inline() used to set $${1}.builds.$${b}.libs, while everything else assumed no such .libs suffix. fix the former. amends 9172143f52. Task-number: QTBUG-61431 Started-by: Konstantin Ritt <ritt.ks@gmail.com> Change-Id: I0bd81591c46266d81baa9c12315411183bbc7a63 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qmake: Introduce and use QMAKE_{SYSTEM,SHELL}_NULL_DEVICE variable, take 2Orgad Shaneh2017-10-134-32/+18
| | | | | | | | | | SYSTEM is used for system() calls, while SHELL is used in the target Makefiles. Task-number: QTBUG-62985 Change-Id: Ia75d3939c59c98699359421166433e8b4a6ee35e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add support for ICC in toolchain.prfTony Sarajärvi2017-09-291-2/+2
| | | | | | Task-number: QTBUG-62531 Change-Id: Ie15a349c830258058d48c9da18b52b343bdb943a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Mark Clang 5.0 as warning-freeThiago Macieira2017-09-181-2/+2
| | | | | Change-Id: I27b55fdf514247549455fffd14b17a4ae1d8ff2d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix conditions in some QMAKE_COMPILER_DEFINES assignmentsRobert Loehning2017-09-151-3/+3
| | | | | | | | | | We obviously should check the variable we're about to get the data from. Amends 1216f596bdb. Change-Id: Ibe87138b9c9aa99837b4fbf3769cd26ca1aaacb9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix quoting of mocinclude.opt for paths containing spacesJoerg Bornemann2017-09-141-1/+1
| | | | | | | | | | | If MOC_INCLUDEPATH exceeds a certain limit, its content is written into a file named mocinclude.opt, which is then passed to moc as a response file. That moc parameter was not properly quoted, and the moc call failed for paths containing spaces. Task-number: QTBUG-63197 Change-Id: Ib0542d80ce1bab239e0e6b6e24fadd11007b1846 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add qmake feature and configure option to use ccacheTor Arne Vestbø2017-09-051-0/+19
| | | | | | | | | | | | Enabled via configure --ccache, or CONFIG += ccache in 3rd party projects. Ensures that we use the right sloppiness and other ccache options during compilation. Task-number: QTBUG-31034 Change-Id: I696b3d3f0398873a29b93d1bc2b4d4e06ef23dc9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: Disable warnings in configure testsThiago Macieira2017-08-241-0/+3
| | | | | | | No need to log them. Change-Id: I3868166e5efc45538544fffd14d8c3cc0012ba12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Use libc++ instead of libstdc++ when compiling with android-clang mkspecBogDan Vatra2017-08-231-0/+1
| | | | | | | | | | | | | | | clang+libc++ is the only supported way by Google nowadays. libstdc++ is too old and already fails to build some C++11 apps e.g. missing std::to_string(). android-g++ mkspec still uses libstdc++ and g++. Use -isystem to include system headers instead of QMAKE_INCDIR_POST (-I). Task-number: QTBUG-60455 Change-Id: Iba8b04594c2e5e2832e6cf480e4e52ff31ad4106 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Propagate all module defines to CMake config filesVolker Krause2017-08-151-2/+2
| | | | | | | | | | | So far this only covered the QT_xxx_LIB define, but not any other defines a module might export (such as QT_NO_QML_DEBUGGER which hasn't been ported to the new configure system yet). Change-Id: I8aae2354fed77a6f0e527ad8d63d25654bb067d0 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* refuse to build examples inside the qt source tree stand-aloneOswald Buddenhagen2017-08-151-1/+7
| | | | | | | | | | | doing so is somewhat likely to cause follow-up issues, as it turns the source tree into a build tree as a side effect. note that this change does not affect building examples inside an install tree, even if doing that is still ugly. Change-Id: I386bf2ab959269f55553c70b7551dd9afec2bcba Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* fix excessive execution of code meant for examples onlyOswald Buddenhagen2017-08-151-5/+6
| | | | | | | | qt_example_installs.prf is loaded by every sub-project inside the qt tree, as qt_build_config adds it. Change-Id: Ice7e81b280b6964ed5cc1b9f1501bf74df737d7e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* employ return() inside qt_example_installs.prf gainfullyOswald Buddenhagen2017-08-151-84/+85
| | | | | | | reduces the indentation level. Change-Id: I7851ffc5e9ecaaa3ae375d14fd245ea3747f61b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: fix detection of icu in static buildOswald Buddenhagen2017-08-151-2/+2
| | | | | | | | | don't complain about library inline sources which have 'builds' but no 'libs'. Task-number: QTBUG-62150 Change-Id: Ib215d438fc02ebdafde95f31cd48088b1bafc663 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* configure: simplify construction of QMAKE_CONFIG_CACHEOswald Buddenhagen2017-08-151-4/+1
| | | | | | | | there doesn't appear to be a reason for the former complexity. QMAKE_CONFIG_LOG was already assigned the simple way. Change-Id: I6b7e3b5b97c7647237841fa5e16c4959079edc16 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make compiler invocation error messages mention host/targetOswald Buddenhagen2017-08-111-8/+14
| | | | | | | | | | | | it's unclear where to look for the error when the message talks about 'g++' when '${CROSS_COMPILE}g++' would have been expected. help it by saying whether it was supposed to be the host or target compiler. this also centralizes the error emissions in a function. Change-Id: I454c6ff7c0e7dd945dcee0de01e2818caeeb7409 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* configure: Add a feature to write tests in the .json fileThiago Macieira2017-08-021-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're adding a lot of unnecessary files that end up later as cargo-cult, for at most a handful of lines. So instead move the testcases directly into the .json file. The following sources were not inlined, because multiple tests share them, and the inlining infra does not support that (yet): - avx512 - openssl - gnu-libiconv/sun-libiconv (there is also a command line option to select the exact variant, which makes it hard/impossible to properly coalesce the library sources) The following sources were not inlined because of "complications": - verifyspec contains a lengthy function in the project file - stl contains lots of code in the source file - xlocalescanprint includes a private header from the source tree via a relative path, which we can't do, as the test's physical location is variable. - corewlan uses objective c++, which the inline system doesn't support reduce_relocs and reduce_exports now create libraries with main(), which is weird enough, but doesn't hurt. Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: Ic3a088f9f08a4fd7ae91fffd14ce8a262021cca0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: factor out $$qtConfScalarOrList()Oswald Buddenhagen2017-08-021-10/+15
| | | | | | | we'll need it in more places. Change-Id: Ia7e3d9ea4a27cc01294bde4cafe6721eb9f59343 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Automatically set metadata for all Qt appsKai Koehne2017-07-312-3/+4
| | | | | | | | | Move the logic to set default values for VERSION, QMAKE_TARGET_DESCRIPTION to qt_app.prf. This way, a lot more executables get sane defaults. Change-Id: I8394418c118a8877cec792eddc8894397c0fbf2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Windows: Simplify generic tool descriptionKai Koehne2017-07-311-2/+2
| | | | | | | | | | | | Make the tool description even simpler so that e.g. moc shows up as "Qt Moc". The 'description' is shown in various places as the mere title, so it shouldn't be too verbose. This augments change ad68bf51e7. Task-number: QTBUG-61970 Change-Id: I4b30b95a10d597a9a8a2c388c2381ea38a340be6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add executable name to description of Qt tools (Windows)Kai Koehne2017-07-191-1/+1
| | | | | | | | | | | | | | | Change f046ed395a5d2c383 set the default values of VERSION and QMAKE_TARGET_DESCRIPTION for Qt tools to generic ones. The version and description is shown in the properties of the executable, but also used for crash reports. For the latter it wasn't clear anymore which tool actually crashed. The patch therefore adds the executable name to the generic description. Tools can still overwrite the description on their own. Task-number: QTBUG-61970 Change-Id: I8366db22f88f0d6575e7f482f030b3c4f05af6c5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix CONFIG+=silent for MSVC non-inference rulesJoerg Bornemann2017-07-141-2/+7
| | | | | | | | | | | | | | | silent.prf modifies the compiler commands by prefixing them with a silencing echo command. For MSVC, the used $< syntax is only valid in inference rules. However, the PCH rule is not an inference rule and breaks when silent.prf is used. Remove the echo command for MSVC. The compiler already outputs the currently compiled file. There's no need to do it twice. Task-number: QTBUG-61688 Change-Id: I7e2c1211e471c9c149c16cac8e87406e88ee2d97 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Only try to resolve library paths via linker for Drawin clangTor Arne Vestbø2017-07-081-2/+2
| | | | | | Task-number: QTBUG-61735 Change-Id: Ia8e777928aa0cff44f092968eac14d32501a5d73 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix detection of QMAKE_DEFAULT_LIBDIRS with Clang under LinuxGiuseppe D'Angelo2017-07-071-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | With 4183475080d334d7d17d02e6ad4eb53c01205c54, Qt fails to build if qmake is unable to detect the compiler's default include and library search paths. Clang on non-Darwin systems was missing working code for the detection. Unlike GCC, Clang on its own does not print the library search paths when called with the -v option. On Darwin, the -Wl,-v option will reach ld64, which will print those paths. However, neither GNU ld nor gold will print anything useful with just -v. GNU ld has a --verbose option that does print some search paths, but those are not the ones used when ld is invoked (via collect2) by GCC or Clang, so it can't be used. To make Clang print its library search paths one can use -print-search-dirs, which however doesn't print include search paths. So amend the existing code in order to make a second call to clang on non-Darwin systems. This second call is used for library path detection, and fixes the build on non-Darwin (tested on Linux). Change-Id: Ic858f908ee1a2e0eb307abb074daee0ded38abd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Disable the -Wstringop-overflow warning from GCC 7Thiago Macieira2017-07-031-0/+2
| | | | | | | | | | | It prints the warning even if we surround the affected code with QT_WARNING_DISABLE_GCC("-Wstringop-overflow") (see e4eaa629439fe1ba1e), so we have no alternative other than to disable the warning completely. Change-Id: Ia3e896da908f42939148fffd14c488c4006040e6 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make Qt's VersionInformation resource strings consistentJoerg Bornemann2017-07-031-2/+2
| | | | | | | | | | The strings in Windows VersionInformation resources should be capitalized by convention, and the entries are usually not terminated by a dot. However, "Ltd." is an abbreviation and should be dot-terminated. Change-Id: Ibea3443ac38846e29a3e77ab3e8d5d77b9370272 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Set VERSION for Qt toolsJoerg Bornemann2017-07-031-0/+3
| | | | | | | | | This creates a VersionInfo resource on Windows for Qt's tool executables similar to what Qt's DLLs contain. Task-number: QTBUG-55755 Change-Id: I9e5d7bedaec9d14f29a9eeeb6697b07241f860d8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* winrt: remove legacy checksMaurice Kalinowski2017-07-031-3/+2
| | | | | | | | Any version prior to 2015 is not supported anymore. Change-Id: I9ccc87fc506521b560fda1b4c88f9c3aebd7a485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: Update capability managementMaurice Kalinowski2017-07-031-2/+28
| | | | | | | | | | | | Introduce uap3 namespace which is used for newly introduced capabilities. In addition, the autodetection of namespaces for capabilities within the uap namespace is disabled in Visual Studio lately. Hence, the output needs to be more verbose including the namespace for a capability. Task-number: QTBUG-60899 Change-Id: Ia1ccf825d4c257d2661e34c195c45fd37e0b6413 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.9.1' into 5.9" into ↵Liang Qi2017-07-021-4/+1
|\ | | | | | | refs/staging/5.9
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-07-021-4/+1
| |\ | | | | | | | | | Change-Id: Ic02646cbab8fd627bc73dac0c52d515d4084bbb0
| | * Revert "don't overwrite pre-existing INSTALL for target"Christian Strømme2017-06-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0e94dd0933c549f35d05318cdcd97572c61fabf, as it introduced a regression for applications that sets an installation target (on Android), which a lot of our examples do. The installation target for Android applications/libraries needs to be within in the application bundle's directory tree, or it won't work. Task-number: QTBUG-61635 Change-Id: I8c919ef3888d7679b0f9659796f5e590bc1faa57 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | fix QMAKE_DEFAULT_INCDIRS detection with Xcode targeting uikit platformsOswald Buddenhagen2017-07-021-1/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | uikit/sdk.prf replaces QMAKE_MAC_SDK_PATH with a make expansion of that variable, which of course does not work when we use the contents directly. amends 6d5489f5d. Task-number: QTBUG-61690 Change-Id: Id77dff8ee7d737dd35f74cc7d39faaa50b4b1ab9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Add query of default include/library paths for QNXJames McDonnell2017-06-291-26/+55
| | | | | | | | | | Change-Id: Iafc5a573a2ddb277d2a786cb6b48521985defe44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Allow using Xcode Command Line Tools to build QtJake Petroules2017-06-294-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users don't want to download the full Xcode installation which can weigh upwards of 5 GB download and 20 GB installed. [ChangeLog][macOS / iOS] Qt can now be built using just the Xcode Command Line Tools, without needing to install the full Xcode IDE. Task-number: QTBUG-35928 Task-number: QTBUG-41908 Change-Id: I6d13c9a03ab9087b3ab56e8547f53f0cc2806c7b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix handling of deprecated QMAKE_IOS_TARGETED_DEVICE_FAMILYJake Petroules2017-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | Since the mkspecs always set QMAKE_APPLE_TARGETED_DEVICE_FAMILY, it will never be empty, and the warning message and automatic fallback to QMAKE_IOS_TARGETED_DEVICE_FAMILY will never be used. Task-number: QTBUG-60430 Change-Id: I79e36d355dae3f8a4429d73e753fed3c090a5d24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>