summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* toolchain.prf: Use vswhere to obtain VS installation pathOliver Wolff2020-10-271-3/+11
| | | | | | | | | | | | Beginning with Visual Studio 2017, vswhere should be used to discover Visual Studio installations. Installations of 2019 and up are not even registered inside the registry anymore, so vswhere is the only way to obtain information about these. Pick-to: 5.15 Task-number: QTVSADDINBUG-819 Change-Id: Ibd8b2c4d38c7925857887f39e750e87a33f08bf9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qmake: Don't warn about using private headers if there are noneTor Arne Vestbø2020-10-231-4/+4
| | | | | Change-Id: I1d9ab0b4d25671931faa469e66cb2beb7bd846fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make entry point module an internal moduleTor Arne Vestbø2020-10-231-1/+1
| | | | | Change-Id: I9eaadc7ce8ca03d64ff3a33c7b6641b073570a61 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix linking of non-console application on mingwTor Arne Vestbø2020-10-201-1/+10
| | | | | | | | | | | | As a result of b5af1408099d the link dependency to the mingw32 static library was ordered after the entrypoint library, which resulted in the WinMain symbol not being found during linking due to how the static linker processes archives. Fixes: QTBUG-87725 Change-Id: I8e075f91f7f06dcdc618a4e0ae6d9c1d832888c0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make configure -qmake actually workJoerg Bornemann2020-10-201-0/+5
| | | | | | | | | We need to ignore this option in qt_configure.prf. This amends 077ea0c63326013ff6d9c85e59b322ffc2ec278c. Task-number: QTBUG-87049 Change-Id: If05b16a95d0830df9ca63961576981f8983820cc Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Generalize the winmain/qtmain entry-point libraryTor Arne Vestbø2020-10-176-16/+4
| | | | | | | | | | The use-case is relevant for other platforms as well. Now that Qt has a module system we can also replace a lot of the hand crafted logic for linking with simpler constructs. Change-Id: Ib6853aaf81bfea79c31f2de741d65b4b56f23ef6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* iOS: Remove dead code for linking to platform pluginTor Arne Vestbø2020-10-161-19/+0
| | | | | | | | | | The code only existed to avoid the auto-generated Q_IMPORT_PLUGIN(QIOSIntegrationPlugin), but nowadays with bitcode enabled the code is not used, plus we end up with this auto-generated file for other plugins anyways. Change-Id: I91c8c88f4e825caab7d7d5250edaba8c57cb7374 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add externConstexpr to MSVC compile optionsUlf Hermann2020-10-131-0/+1
| | | | | | | | We want this in order to be able to export constexpr members. Change-Id: I33ba7964ebee54fe656df983985d8d6fa0b99358 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* rename win32-arm64-msvc2017 to win32-arm64-msvcOliver Wolff2020-10-092-1/+1
| | | | | | | | | The mkspec works with msvc 2019 as well. As 2017 is no longer supported, we should reflect this reality in the mkspecs naming. Change-Id: Ib1165343d43fd50eebc5e4e598e653ddc4a9b1ab Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: use shell path format when running qmake install stepAssam Boudjelthia2020-10-061-1/+1
| | | | | | | | | | On Windows shell, using unix path format might not work, since the shell expects backslash paths only. Pick-to: 5.15 Task-number: QTBUG-87066 Change-Id: I51741b475c1ede11336df63ee1c6092c792c16ef Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: unify deployment-settings.json path to unix formatAssam Boudjelthia2020-10-021-1/+1
| | | | | | | | Always use unix path formats for qmake and cmake builds. Task-number: QTBUG-87066 Change-Id: I9d54c2ca687d28e38542850e3e18b6184513a9af Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Remove old Qt 5 CMake build system filesAlexandru Croitor2020-10-017-788/+0
| | | | | | | | | | | | | | | Remove the stale Qt 5 CMake files. Disable the generation of CMake files by the qmake build system, it wouldn't create usable Qt 6 files anyway. Keep mkspecs/features/create_cmake.prf and mkspecs/features/cmake_functions.prf for now until we can confirm that they are safe to remove. Task-number: QTBUG-86827 Change-Id: Idcf59f4d7d5474171a9bf72904ff19adc8bc74cd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: add qmlimportscanner and rcc paths to deployment-settings.jsonAssam Boudjelthia2020-09-231-0/+3
| | | | | | | | | qmlimportscanner and rcc in Qt 6.0 are part of the host installation and not in the target installation which androiddeployqt expects it to be. Fixes: QTBUG-86831 Change-Id: I9d7a6fce3d2f109bab933fcfd7fdd5d2c83821a8 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Use 'A' for Apple framework version instead of Qt major versionTor Arne Vestbø2020-09-232-4/+5
| | | | | | | | | | All system frameworks use 'A' instead of the major version of the framework, and Xcode's code signing assumes that the framework version is 'A' when signing embedded frameworks (FB7323980), so leave the version 'A'. This is also what Apple recommends. Change-Id: Idbf2e30e156c3e869da8f75731e568524d9407e5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Pass -arch when running toolchain configure test on Apple platformsTor Arne Vestbø2020-09-211-0/+4
| | | | | | | | | | | | | Clang doesn't automatically switch architecture just because we're passing an iPhoneOS sysroot. In the past this resulted in a warning about trying to link an x86_64 binary to arm64 libraries, but with Xcode 12 this is now a hard error. Fixes: QTBUG-86718 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I7e9d2ca513d276029fc2a6cfe694a35fe41c39b3 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Android: bump default javac build versions to 8Assam Boudjelthia2020-09-161-2/+2
| | | | | | | | | Use -source 8 and -target 8 for javac by default. Task-number: QTBUG-86282 Change-Id: I291beab4df166468972138822ca26f01c9666985 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: allow setting javac build version from the configure scriptAssam Boudjelthia2020-09-161-1/+10
| | | | | | | | | | | The configure options -android-javac-source and -android-javac-target can be used to set the version numbers. Fixes: QTBUG-86282 Pick-to: 5.15 Change-Id: I36b0665de2c31e16bf6d138859b5503455eb8e66 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Remove the -no-compile-examples configure switchJoerg Bornemann2020-09-111-12/+1
| | | | | | | | | | | | If '-make examples -no-compile-examples' was specified, sources of Qt's examples would be installed, but the examples would not be built. This switch has always been a source for confusion and is only interesting for distributors, who can just package the examples directory tree. Change-Id: I0291d70e4951d98b553a4abf217db49d05316d3a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qmake: Do not pass -mthreads to ClangOrgad Shaneh2020-08-282-2/+3
| | | | | | | | | It is not supported. Warning: argument unused during compilation '-mthreads'. Change-Id: I6de147c15dbf3c7f416b233e739ce2de183701af Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android: add option to get app arguments with AndroidManifest.xmlAssam Boudjelthia2020-08-281-0/+3
| | | | | | | | | | | AndroidManifest.xml file and the Android plugin already has a way to provide commandline-arguments to app with the tag "android.app.arguments". This change allow to set it from qmake/cmake and allow Qt Creator to use that. Task-number: QTCREATORBUG-23712 Change-Id: I3e680f40fd36ba6aaac7f344fb9509d2c3360e74 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Make configure -force-asserts affect the Qt build onlyJoerg Bornemann2020-08-272-1/+2
| | | | | | | | | | | | Before this change, configure -force-asserts would affect qmake-based user projects too, potentially forcing the user to remove the QT_FORCE_ASSERTS define in their own projects. [ChangeLog][configure] The -force-asserts option now affects the Qt build only, not user projects. Change-Id: Iecca3c9f7e8261996c5d8bcba8adbc0db1dc1c99 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* headersclean: Check for all-W3 MSVC warningsKai Koehne2020-08-261-7/+1
| | | | | | | | | | | | | | | C4180, C4458 were disabled already in 2012, in commit 6668f5becfb. C4577 was disabled due to QtScript being compiled without exception support in commit 97d7d80e735. Anyhow, Qt Script is now officially gone in Qt 6, and Qt headers do work just fine with C4180. Finally, C4458 is nowadays a W4 warning, so not enabled in the first place. Task-number: QTBUG-82615 Change-Id: I2f9b8e858817876b069a166129fbfac7ef3587a0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Android: Fix building apps when Qt is configured with one ABIAlexandru Croitor2020-08-263-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | When configuring with Qt only with one ABI, certain code paths were not triggered, which led to a few issues: - The deployment json file generated by androiddeployqt listed no architectures. - The compiled shared library did not have a lib prefix and arch suffix, which androiddeployqt during the deployment / make apk step. To fix the architectures missing in the json file, ANDROID_ABIS needs to be set in android/resolve_config.prf also in the single abi case. To get the correct file names, android.prf needs to apply the prefixes and suffixes not only in the build_pass case (multi-abi) but also in the single abi case (except for config.tests). The application-binary entry in the json file needs to be without the extra prefixes and suffixes though, so make a copy of the TARGET value to be used in the json file, before the name manipulations are applied. Pick-to: 5.15 Task-number: QTBUG-85399 Change-Id: Idde92ab7fe883636ccc65a87b91c8a3fc72eefbb Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Android: Fix make check to work for single ABI Qt for Android buildsAlexandru Croitor2020-08-261-1/+1
| | | | | | Task-number: QTBUG-85399 Change-Id: I049d430c0883a9bff43f7012b1274bbd48b25859 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add QML2_IMPORT_PATH import paths to qml-import-paths listBogDan Vatra2020-08-241-2/+7
| | | | | | | | QML2_IMPORT_PATH it's usually set by CI to tell the QML apps where to find the QML components Change-Id: I57d1cbc3d0fce9be257648268da0a5f9d61d81e9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix running qml tests on AndroidBogDan Vatra2020-08-242-27/+39
| | | | | | | | | | | | | | First and foremost the condition was wrong ... In order to help running qml test cases on Android without any android specific hack on user's .pro files we copy the entire project folder to assets. I copy the entire folder and not only the tst_*.qml files because it might contain data which is needed by the tests to run. Change-Id: I06323d9d52904317410dd2f440de65a0766a48b5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* configure: Explicitly enable float-divide-by-zero with ubsanRobert Loehning2020-08-071-3/+3
| | | | | | | | | | Before clang 9, it was enabled by default when -fsanitize=undefined was set. Pick-to: 5.15 Change-Id: I0faf3ae1901d4badc6d265fa8081185be4360636 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Android: Install the qmldir files when configuring for a single abiAndy Shaw2020-08-035-5/+5
| | | | | | | | | | | This amends 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 to ensure the new configuration is styled correctly for qmake. Task-number: QTBUG-80938 Change-Id: Iebfff3ff0570d2e92d01d4eb1178c0d6261468f9 Pick-to: 5.15 Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove no-longer-applicable -Wno-error for GCCThiago Macieira2020-07-311-9/+0
| | | | | | | | | | | | We don't appear to have implicit fallthroughs in our code anymore. The last deprecated copies and redundant moves are also gone. The other warning never had an explanation and doesn't show up when building full Qt anyway. Change-Id: Iad959315ad374ef288f5fffd15d683599a1a11b9 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Build testcase_lowdpi tests as application bundles on macOSTor Arne Vestbø2020-07-261-0/+4
| | | | | | | | As stand-alone executables are not tracked by Launch Services, which is responsible for applying the low-dpi override at runtime. Change-Id: Ifac71dfa9b9ffa5ab1302dfca8fa1f5ddd491082 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* testlib: Set AA_UseHighDpiPixmaps false for low-DPI testsTor Arne Vestbø2020-07-241-0/+2
| | | | | Change-Id: I129118c303527e4aff25c4d5326eefa43c231d44 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add -Wsuggest-override for gcc >= 9.2Alexander Volkov2020-07-241-0/+2
| | | | | | | | | gcc doesn't report warnings for final methods since version 9.2: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78010 Change-Id: I7152351aac0e3bad86d777e119f25137ef97ec6f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* testlib selftest: Don't pass TESTARGS to Catch2Tor Arne Vestbø2020-07-231-1/+1
| | | | | | | It doesn't understand the arguments we usually pass to testlib. Change-Id: Iea83d1d8c31a510b2bc442cbfc810eac631322e7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* iOS: Add a variable to customize where the launch image is taken fromAndy Shaw2020-07-222-7/+10
| | | | | | | | | | | | | For those who are providing their own launch images for their iOS projects then QMAKE_IOS_LAUNCH_SCREEN can be set to point to the location where the launch image to be used over the default. [ChangeLog][Platform Specific Changes][iOS] Added support for specifying a launch image to be used for an iOS project. This can be achieved by using QMAKE_IOS_LAUNCH_SCREEN. Change-Id: Ibb236655b282132ab5eee747986a93abb9802200 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Use --strict option for wayland-scannerPaul Olav Tvete2020-07-211-3/+3
| | | | | | | | Make protocol definition errors build errors. Task-number: QTBUG-73100 Change-Id: I834d1a9f6f4150875732772c14bde15b5e12b4e8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Stop using deprecated wayland-scanner argumentPaul Olav Tvete2020-07-211-1/+1
| | | | | | | | The argument "code" is deprecated. Use "public-code" instead. Task-number: QTBUG-73099 Change-Id: I3e822df956613d4f8338525324ffca744f27bc0c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Make -qtlibinfix affect the names of plugins by defaultJoerg Bornemann2020-07-131-2/+1
| | | | | | | | | | | | | | | | In Qt5, the -qtlibinfix option did not affect the naming of plugins, unless -qtlibinfix-plugins was set. This option was added in 56416509930 to offer a way to have -qtlibinfix affect the plugin names without changing the default behavior. We now remove the -qtlibinfix-plugins option, as the old behavior is not desirable. [ChangeLog][configure] The -qtlibinfix option now affects the names of plugins. The -qtlibinfix-plugins configure option was removed. Task-number: QTBUG-15192 Fixes: QTBUG-85439 Change-Id: I96f5c2577b76274929c431621967df0e9b4631b7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Android: Enable configuring for a single abi architectureAndy Shaw2020-07-104-4/+6
| | | | | | | Fixes: QTBUG-80938 Pick-to: 5.15 Change-Id: Id87202e6b2520b18c6b06b71675157f588a28bd6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-07-071-2/+2
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qmake: Share QMAKE_LINK_OBJECT_SCRIPT definitionOrgad Shaneh2020-07-063-2/+2
| | | | | | | | | | | | It is only used by default on Windows, but can be enabled by setting QMAKE_LINK_OBJECT_MAX. The current file name is .project_name. Use a sensible file name on this case. Change-Id: Ic250d024e5feca739027c79a6e285d616234c4ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Limit OpenGL deprecation silencing on Apple platform to Qt itselfTor Arne Vestbø2020-07-023-4/+7
| | | | | | | | | | | | | | | | | | | | | Apple deprecated the entire OpenGL API in favor of Metal, which we are aware of, so we don't need to see the warnings when building Qt. Instead of applying the silencing globally for all Qt consumers, both internal and external, we now limit the silencing to Qt itself. That means user code that explicitly uses any of the deprecated APIs will see the warnings. Note that this does not apply to merely using any of the Qt OpenGL APIs. The user has to explicitly use the platform APIs that have been deprecated. The warnings need to be disabled on a build system level, so that that they are passed as -D flags on the command line. If the defines were done in Qt headers (qguiglobal.h e.g.), they would require the user to always include this header before any of the Apple headers. Change-Id: I3f2a2a5211332a059ad4416394251772c677fdcb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Use target install prefix for MODULE_BASE_OUTDIRAlexandru Croitor2020-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | When building qtbase for iOS with CMake, and then trying to mix build qtsvg with qmake, the value of MODULE_BASE_OUTDIR was wrongly set to the host prefix because that usually coincides with the target prefix when doing builds with just qmake. That is not the case for CMake builds, where the host and target prefix locations are necessarily different. This caused syncqt to place the forwarding headers inside the host prefix location instead of the target prefix location, and thus compiling qtsvg files failed. Make sure to use the target install prefix instead of the host one. Task-number: QTBUG-82581 Task-number: QTBUG-84781 Task-number: QTBUG-85240 Change-Id: I592be0b2799c72c11497c8adc12be13106082cfc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Raise the Android SDK build requirement to lvl 28 - compile fixAlex Blasche2020-06-231-1/+1
| | | | | | | | | | | | | | | First of all cmake and qmake used a different standard. Secondly, the qmake logic enforced lvl 23 (if it was installed which is the case on the failing machine). When this is combined with f71a400bf61 which requires lvl 28 API to build, the android build fails to compile. cmake logic was even worse as it enforced lvl 21 API to be used if installed. This change requires pick to 5.15 as f71a400bf61 was picked as well. Pick-to: 5.15 Change-Id: I89a7193b711b8bf927d02907343a49d6f27082ce Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: fix regexp error in android_deployment_settings.prfAssam Boudjelthia2020-06-161-1/+1
| | | | | | | | This might be related to the change a1947aeffe158a0ea7de3ced1bf8d6a4719a27ef. Change-Id: I1c697e3130abd3eb26776d352a0f9bff0065c8f6 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* qmake: Remove "Cannot find library" warningsJoerg Bornemann2020-06-151-4/+0
| | | | | | | | | | | Remove the warning message that was introduced in 84f27925971. It is triggered for debug_and_release projects that are built against a single-configuration Qt. Silently fall back to the behavior before 84f27925971 like it always was the case. Change-Id: I67ed1a145ec5d7a4047b0ce5ad43bf0fc6834d60 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* qmake: Support .dll.a import libraries for MinGW builds of QtJoerg Bornemann2020-06-111-1/+20
| | | | | | | | | | | | | | | | CMake's default import library extension for MinGW is .dll.a. The code in qt.prf that resolves the values of the QT variable expected an .a extension. To play well with CMake world we keep the the .dll.a extension for Qt's libraries and teach qt.prf to handle both. In order to do that we need to check for the existence of the .a or .dll.a file. If none of these candidates was found we print a warning and fall back to the old behavior. Task-number: QTBUG-84781 Change-Id: If394f2d6acd104deb0c3a49240009a1900a506f7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Always add an empty json file to MOC_JSON_FILESUlf Hermann2020-06-091-0/+9
| | | | | | | | | | This way the metatypes files are generated even if there are no metatypes in the module. This is necessary in order to generate empty QML modules, which in turn is useful if we only want e.g. URL interceptors in a module, but not types. Change-Id: Ief949cfebe831b69353a75d0da15ee347995051c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove winrtOliver Wolff2020-06-0645-1188/+4
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* qmake: Stop using -isystem flagDmitry Shachnev2020-06-063-3/+0
| | | | | | | | | | | This option changes the order of include paths, which can cause problems of various kinds. See https://bugs.debian.org/958479 for an example. The benefit of that option is minimal for what it was intended. Pick-to: 5.15 5.12 Change-Id: I80eeabd09764df290b60bc59aeb2f90d07723608 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix include paths for prefix + framework + qtlibinfix builds of QtJoerg Bornemann2020-06-041-1/+1
| | | | | | | | | | | | | | | Prefix framework builds of Qt that use the -qtlibinfix had wrong include paths in qt_lib_XXX.pri files which broke compilation of user projects. We now honor QT_LIBINFIX in qt_lib_XXX.pri files. However, due to how framework includes work, module-style includes like #include <QtCore/qstring.h> still do not work. Use <qstring.h> or <QString> instead. Fixes: QTBUG-84219 Pick-to: 5.15 Change-Id: I5314ee810e64cbba6dba06a84064d48bb4ff3377 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 23:11:35 +0000