summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove whitespace for file names generated from TARGETKai Koehne2020-06-022-3/+12
| | | | | | | Task-number: QTBUG-84492 Pick-to: 5.15 Change-Id: I70e79b7a57949e8dfd3781967e775bdea8822e0c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* wasm: add more debugging informationLorn Potter2020-05-291-2/+3
| | | | | | | | | This also fixes source maps not getting created in debug mode. Pick-to: 5.15 Fixes: QTBUG-83607 Change-Id: I3ed388c4fef6c286fa452a1c700fa65c2a8f9529 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Override debug generation request on mac for toolchain.prfMichal Klocek2020-05-281-1/+1
| | | | | | | | | | | | | Override request for debug info during compiler 'test', otherwise call to dsymutil will fail call with /dev/null. Use case here is to pass for example -glldb with CXXFLAGS. Fixes: QTBUG-62953 Fixes: QTBUG-84467 Pick-to: 5.15 Change-Id: Ief8f987afb40d0b90da732195d67d476e7bb3aff Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix compilation of PCRE2 under Intel CETGiuseppe D'Angelo2020-05-271-0/+2
| | | | | | | | | | | | Ubuntu 20.04 enables -fcf-protection by default. PCRE2 10.35 sees this but complains that -mshstk is also necessary to build its JIT. Detect whether the compiler is enabling Intel CET automatically, and if so, build PCRE2 with the right options. Pick-to: 5.15 Change-Id: I3440e689b81f4f07055f211a4fa7331a43eb410d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Run moc on non-PCH sources as wellTor Arne Vestbø2020-05-271-1/+3
| | | | | Change-Id: Idccfc8f7b182169c5becfb28dec5aef4fc7079b1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove ANGLELaszlo Agocs2020-05-266-55/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This marks the end of EGL and OpenGL ES support on Windows. The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software, etc. remain unchanged, with the exception of the disapperance of everything ANGLE related. CMake builds now work identically to qmake on Windows: they default to 'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified. On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by default, just like Qt 5.15. This can be changed by switching to "desktop" OpenGL, which will link to opengl32 (publicly, so other libs and applications will do so as well) and disallows using another OpenGL DLL. The "dynamic" mode is essential still because the fallback to a software rasterizer, such as the opengl32sw.dll we ship with the Qt packages, has to to work exactly like in Qt 5, the removal of ANGLE does not change this concept in any way (except of course that the middle option of using ANGLE is now gone) When it comes to the windows plugin's OpenGL blacklist feature, it works like before and accepts the ANGLE/D3D related keywords. They will then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but will show a warning). The D3D11 and DXGI configure time tests are removed: Qt 5.14 already depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally on Win32 (in QRhi's D3D11 backend). No need to test for these. [ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL builds work like before but ANGLE is no longer an option. OpenGL proper or an alternative opengl32 implementation are the two remaining options now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have no effect on Windows. Fixes: QTBUG-79103 Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Android: Fix RESOURCES for Android MultiAbIBogDan Vatra2020-05-221-1/+1
| | | | | | Pick-to: 5.15 Change-Id: I57560f51115ae560e3133096f402c6c9735f15a6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Remove -qt-xcb, -system-xcb from README and commentsKai Koehne2020-05-191-1/+1
| | | | | | | | The options got removed in commit 60588e1a5dd Pick-to: 5.15 Change-Id: Ic94f58885dab6de3c563b3dab70385570864b47d Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* Configure: Do not automatically enable compilation of examples for testsKai Koehne2020-05-191-8/+1
| | | | | | | | | | | If user's specified to build without examples we shouldn't silently overwrite this. This might mean that some tests will fail to run then, though. Fixes: QTBUG-84087 Pick-to: 5.15 Change-Id: I53748fc03354ffdf015f85c93efc6e86c446adb8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-05-182-2/+9
|\ | | | | | | | | | | | | Conflicts: src/corelib/text/qbytearray.cpp Change-Id: I63706409464d31391012bacdadfd1f6300509787
| * CMake: Don't hard-code the sysroot in Qt5XXXConfigExtras.cmakeJoerg Bornemann2020-05-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Instead of writing the hard-coded sysroot into the .cmake file, write the variable ${CMAKE_SYSROOT}. This makes it possible to relocate the build to a machine where the sysroot is different from the build machine. Fixes: QTBUG-83335 Change-Id: Iaa69feb9a140b050f6b5547929cc940ee0f039ce Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-1/+1
| |\ | | | | | | | | | Change-Id: I06396fa0a3d1687a0935e48d290358edbb0e59e8
| | * Fix scanned resources in static buildsv5.15.0Tor Arne Vestbø2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-81621 Change-Id: Ica23e99054c7b2498bdb1e256c256c8b430938b4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Make utf8_source the default for qmake buildsLars Knoll2020-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now assume that source code is encoded in UTF-8 by default on all platforms (and verify this with an auto test). Provide a CONFIG+=no_utf8_source option for backwards compatibility. [ChangeLog][qmake] qmake will tell the compiler that source code is encoded in utf-8 by default. This mainly has an effect on Windows, where MSVC still assumes source code is encoded in the current ANSI code page. Use CONFIG+=no_utf8_source to get back the Qt 5 behavior. Change-Id: I6dcafcaeefdea7d3907ccb723aeb7d23ccc0f04f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | iOS: Remove deprecated image-based launch screenTor Arne Vestbø2020-05-112-21/+7
| | | | | | | | | | | | | | | Change-Id: I50a7121c55170e1fb6950fdf7bb854cf6699df67 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | re_escape QMAKE_INCDIR_VULKANLaszlo Agocs2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid getting errors like the following: Encountered invalid regular expression 'C:\VulkanSDK\1.2.131.2/include'" Change-Id: I734995878d24bc124f486fb5145ea64d0d5a9c64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Revert "Don't reference build directory in helper lib pri"Liang Qi2020-05-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9d9ac5bb07a737c862b40302cd681f7b3b321fd. This breaks prefix build which tries to link to install folder. Task-number: QTBUG-83967 Change-Id: I084152afde91c2063154bef8ac99d7e997c9394b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 06:19:35 +0000