summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/platform.prf
Commit message (Collapse)AuthorAgeFilesLines
* Re-enable building on the MSVC2017 botAllan Sandfeld Jensen2018-10-121-1/+2
| | | | | | Change-Id: Ic95e4656798810da778d6b7a618c475cc7f1258c Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* [macOS] Fix build with XCode version 10Michael Brüning2018-10-121-1/+1
| | | | | | | | Somehow, the isMinXcodeVersion check was overwritten by the old style lessThan checking. Change-Id: Ife14a139ef63cad0e2d9fdb63da8eca988ac6fc9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Chromium requires C++14Allan Sandfeld Jensen2018-10-111-2/+2
| | | | | | | | | QtWebEngineCore was only building because Chromium CPPFLAGS was overriding ours. And setting C++11 in our examples and tests now forces a downgrade. Change-Id: I3642394f15bb9974688991800552624d2379faf9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* General adaptations for Chromium 69Allan Sandfeld Jensen2018-09-221-2/+2
| | | | | Change-Id: Ifeaf0ee13213dc5a24d2f2b4655cf7f405cddef7 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Michael Brüning2018-08-211-0/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc mkspecs/features/platform.prf src/3rdparty src/core/media_capture_devices_dispatcher.cpp src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/web_contents_adapter.cpp Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
| * Fix Xcode version check to work with major versions >= 10Alexandru Croitor2018-07-231-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used lessThan for the Xcode version check, which started to fail when comparing Xcode 10 with Xcode 7.3, because lessThan first tries to convert the arguments to ints and if that fails, it does string comparison instead. Rewrite the code to be similar to the SDK checks. We can't use the qmake versionAtLeast function because it was added in Qt 5.10, and we still need to be able to build against Qt 5.9. Task-number: QTBUG-69476 Change-Id: I831a683ee676838a4d531a4d6e715182e9e4193d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix minimum GCC version in documentationJüri Valdmann2018-07-231-0/+1
| | | | | | | | | | | | | | | | | | The documentation says we require 4.7 or later but actually already since the 5.10.0 release our qmake config has been checking for version 5 or later. Task-number: QTBUG-69535 Change-Id: Ia2f74b35570a9ba6fd1423b9507fe636d850db76 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Lower Xcode version requirement to 8.3.3 from 9.0Alexandru Croitor2018-07-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | Also adjust the docs and configure checks with the true required version of the OS, compiler and SDK. [ChangeLog][General] Updated macOS build requirements to macOS 10.12, macOS SDK 10.12, Xcode 8.3.3. Change-Id: I12a8e8abeca7853f4d4e046c90e271a8e5989131 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 67Allan Sandfeld Jensen2018-06-261-2/+3
| | | | | | | | | | Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fine tune configure and clean up header includesMichal Klocek2018-06-121-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Clarify Windows build requirementsJoerg Bornemann2018-03-121-1/+1
| | | | | | | | [ChangeLog][QtWebEngine] QtWebEngine requires Visual Studio 2017. Task-number: QTBUG-66596 Change-Id: Ib9961afef17bc095bdf983cb06981e16963157c1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Adaptations for Chromium 63Allan Sandfeld Jensen2018-01-251-4/+2
| | | | | Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-121-1/+1
| | | | | | | | This is done to make sure there are no conflicts with features in other modules, because they all share a global namespace. Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Cleanup skipBuild codeMichal Klocek2017-09-191-0/+150
Move all skipBuild related checks to runConfigure() in configure.prf. Remove some unused functions. Move platform checks to separate prf file. Change-Id: Ia45c837c91c341ed1fbc2e32fc098329da989920 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 20:46:53 +0000