summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix detection of ozone x11 supportMichal Klocek2019-07-122-15/+3
| | | | | | Fixes: QTBUG-77011 Change-Id: I0136b360c74970b912124f6f308f598c80eceba3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix detection of the webengine-arm-thumb featureJoerg Bornemann2019-05-211-9/+0
| | | | | | | | | | | | | | | | Configure tests must run in a clean environment. That's why functions that are defined below the mkspecs directory are discarded during the configure run. As a result, extractCFlag could not be found when running qtConftest_hasThumbFlag. This patch moves extractCFlag to src/core/config/functions.pri. Also, extractCFlag gets a qtwebengine_ prefix to avoid collisions with functions defined in other modules. The alias extractCFlag in functions.prf lets us use the old function within QtWebEngine itself. Fixes: QTBUG-75748 Change-Id: I6be613fbc569d5f7b3c145ef44b9a7be8e2ecb9d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Skip qtwebengine for -no-gui buildKai Koehne2019-04-291-0/+4
| | | | | | | Fixes: QTBUG-75465 Change-Id: Iaf8c75d60d00dac3079fcb3f7108e1c3e5ea5245 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix build when we don't have all the X11 dependenciesAllan Sandfeld Jensen2019-01-172-2/+2
| | | | | | | | | | We only enable the GLX backends when we have all the X11 dependencies, but try to build the corresponding sources files even when we don't. And additional xrandr is no longer a dependency. Change-Id: I35c97c34c6d121bd6544344a73653900bf406be3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix running thumb vs arm instruction set on yoctoMichal Klocek2018-11-211-1/+3
| | | | | | | | | | | | On yocto CC/CXX export contains flags like -marm, -mthumb see https://lists.yoctoproject.org/pipermail/poky/2018-September/011497.html Fix builds for webengine and check also QMAKE_CC for flags, otherwise build ends up passing -marm and -mthumb flags at the same time. Change-Id: I76feb0eaf3bed8a6c3552db1bbf1a0809f03110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Leave the decision of including RTTI information to the compilerAlexandru Croitor2018-11-131-0/+12
| | | | | | | | | | | | | | | | | | | | | | | This change removes the Chromium default of stripping RTTI information from our own cpp files in QtWebEngineCore. This means RTTI information will be emitted based on the compiler's defaults, which follows the same principle as qtbase, which does not explicitly include or exclude the information. A user can still override this by adding CONFIG+=rtti (or rtti_off), which will propagate correctly to GN (but this only really applies to Windows). DLL size difference on a debug build is only 78KiloBytes. Usecase is that RTTI info is currently required by PySide2 for marshalling various QObjects to and from Python, and identifying dynamic types by means of C++'s typeid(). Change-Id: Idb9dacbd1760dbf5b29736b2f2c731b9f6514885 Fixes: PYSIDE-819 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add extra config check for x11 ozone pluginMichal Klocek2018-10-231-0/+9
| | | | | | | | In case of cross compilation for targets with x11, check also for dependencies. Change-Id: I32df962a61e5a13ee1290ab2c256f0f222dafbd3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* 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>
* Cleanup gn-generatorAllan Sandfeld Jensen2018-10-121-40/+41
| | | | | | | | Moves what can be to a config which avoids some boilerplate logic, and fix some other ugly parts in the generated results. Change-Id: Ifc4386009f95acb202f9482fa3a5857500fd5622 Reviewed-by: Michal Klocek <michal.klocek@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>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-271-0/+5
|\ | | | | | | | | | | | | | | | | Conflicts: configure.json configure.pri src/3rdparty Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
| * Check if windows has 64 bit compilerMichal Klocek2018-09-261-0/+5
| | | | | | | | | | | | | | Task-number: QTBUG-68462 Task-number: QTBUG-70728 Change-Id: I4314bce427555504cb49de93af45c910de554479 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* | Adapt to new GN submoduleAllan Sandfeld Jensen2018-09-221-1/+1
| | | | | | | | | | | | Change-Id: I3980634a1029479ab944b2e03f12a02d0c77d0c1 Reviewed-by: Michal Klocek <michal.klocek@qt.io> 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>
* | Use ozone for x11Michal Klocek2018-08-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to use ozone also for x11/glx. This way we have a more elegant approach to hook in our gl surface classes and we use ozone for all linux qpa backends. Moreover, we have now also more fine grain control to reimplement gl surface handling logic. This also aims to fix currently broken wayland backend, but instead of patching the broken x11 calls, we simply reuse ozone which does not use x11 for ozone egl. Add webengine-x11 check to handle ozone glx plugin compilation. For ozone egl backend reimplement missing functions. Task-number: QTBUG-65682 Task-number: QTBUG-51631 Change-Id: I8b45c6f4d09a1c703efb12b6452d78ab385371ab Reviewed-by: Jüri Valdmann <juri.valdmann@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>
* | Add hack to export our headers to ChromiumMichal Klocek2018-07-031-0/+8
| | | | | | | | | | | | | | | | | | | | Add hack to export core headers and move back service_qt to main repo. This change pulls the required change in Chromium Change-Id: I8c73cd20c4358c51911b98b42922e1361bfb28b6 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-122-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-02-022-0/+28
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/download_manager_delegate_qt.cpp src/core/download_manager_delegate_qt.h src/core/render_widget_host_view_qt.cpp src/core/web_contents_adapter.cpp src/webengine/api/qquickwebengineview.cpp tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp Change-Id: I2308414ce257ae5bb0fc9f6493aa111a267ff39b
| * Add 32bit host compiler testMichal Klocek2018-01-241-0/+7
| | | | | | | | | | | | | | | | | | The 32bit compiler is required for creating v8 snapshots. Task-number: QTBUG-65004 Task-number: QTBUG-64869 Change-Id: I0a7a351208768f0b12900fac14d3abd5c8d99fa2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add pkg-host wrapper scriptMichal Klocek2018-01-232-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we need pkg-config host for cross-builds to build build tools. Unfortunately if build environment exports PKG_CONFIG_* variables pkg-config will pick them up also for host builds, which can lead to compile errors. Create pkg-config-host_wrapper which explicitly unsets PKG_CONFIG_* variables. This is a temporary workaround till proper solution is implemented in qtbase. Task-number: QTBUG-65079 Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178 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>
* | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2018-01-172-12/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/webengine/api/qquickwebengineview_p_p.h src/webenginewidgets/api/qwebenginepage_p.h tests/auto/quick/qmltests/data/TestWebEngineView.qml Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3
| * Fix sanitizer buildAlexandru Croitor2018-01-101-1/+1
| | | | | | | | | | | | Task-number: QTBUG-64726 Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2018-01-081-11/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/api/qwebengineurlrequestjob.cpp src/core/browser_context_adapter.cpp src/core/renderer/user_resource_controller.cpp src/core/web_engine_context.cpp src/webenginewidgets/api/qwebenginepage.cpp Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a
| | * Remove QT_LIBDIR_EGL/GLES2 leftoversMichal Klocek2018-01-021-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since e812237b69 we do not longer use QT_LIBDIR_EGL and QT_LIBDIR_GLES2 to dynamically load gl libraries. Remove leftovers from gn generator. Task-number: QTBUG-65442 Change-Id: I045242b49be411373d36eb9c333916d27b0f169d Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-11-293-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/web_event_factory.cpp src/core/web_event_factory.h src/webengine/render_widget_host_view_qt_delegate_quick.h Change-Id: Ic43787e2689c81b501ed395a990190eb67d83a2b
| * | Add 'webengine' prefix to configure features, tests, libraries, etcAlexandru Croitor2017-11-123-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-10-271-0/+5
|\| | | | | | | | | | | Change-Id: Ibc1c881a67bf088ba6fb044e2553c74c7e9e24ca
| * | Readd isDeveloperBuildAllan Sandfeld Jensen2017-10-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Is still used by windows builds when gn needs to be regenerated. Removed in d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd Change-Id: I81d42f058dab251e79acca47e76b950c725cfaf2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Merge branch '5.10' into devAllan Sandfeld Jensen2017-10-131-1/+2
|\| | | | | | | | | | | Change-Id: I3a411e4019a5ec2f7d1a967b62a00ad7cf92f6f4
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Allan Sandfeld Jensen2017-09-291-1/+2
| |\| | | | | | | | | | Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
| | * Add mkspecs include path to the gn buildPeter Varga2017-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | INCLUDEPATH qmake variable doesn't contain mkspecs include path. Add it explicitly to the include_dirs gn variable in the gn generator. Change-Id: I454aa015794f258f588590b4662a16c04041c8fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Clean up remote devtools implementationAllan Sandfeld Jensen2017-10-131-17/+19
|/ / | | | | | | | | | | | | | | | | Rename the file after the contents has been refactored being different classes, and switch to using Chromium discover HTML page which we now have available and which works. Change-Id: Ic04a56471be3a49e5d1dd4b1f914eda927272d89 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Simplify binary pathsAllan Sandfeld Jensen2017-09-201-7/+2
| | | | | | | | | | | | | | | | These old names were for gyp, and are not needed for gn, so we can instead use the same path names Qt would use. Change-Id: I423c2a04df6740ebba84f8c670490dbcf59c3ca7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove WEBENGINE_CONFIG from configureMichal Klocek2017-09-202-71/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not store flags in qmake.cache with WEBENGINE_CONFIG. Use directly qtConfig values insted. This makes configuration more consistent, simplifies handling and avoids passing values from qtConfig to WEBENIGNE_CONFIG, which then were passed to gn. [ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Add testsupport to new configure systemMichal Klocek2017-09-191-12/+0
| | | | | | | | | | Change-Id: I123ce22ea3a3d8b7b80c67fa322cb817d924f2e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Cleanup skipBuild codeMichal Klocek2017-09-193-183/+183
| | | | | | | | | | | | | | | | | | 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>
* | Move webengine sanitizer option to new configure systemMichal Klocek2017-09-182-101/+5
| | | | | | | | | | | | | | Use new configure system to enable sanitizer. Change-Id: I633bc96973b9b9bcd56c4ef03a589e147215dc86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Make cross compilation builds againMichal Klocek2017-09-131-5/+0
| | | | | | | | | | | | | | | | | | 1292b30 fixed existing b2qt ci compilation issues. Enable cross compilation builds in ci. Change-Id: I2092451c16a5cbdfff0dd57e627ddbded0001f79 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Migrate configuration lefovers to new configure systemMichal Klocek2017-09-121-94/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | Use new configure system for all package detection. Move config test execution to new configure system. However, keep old configure.prf for error hanlding. Split configuration summary into: * optional system libraries used * required system libraries * required system libraries for qpa-xcb (on linux) Change-Id: I5108456caa024a1ada9bb54750693064a2d36f78 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adaptations for Chromium 60Alexandru Croitor2017-09-112-8/+16
| | | | | | | | | | | | Change-Id: I536258e22c2ec143f2fd3f1cbda229e0611b6af4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Merge branch '5.9' into 5.10Allan Sandfeld Jensen2017-09-062-12/+4
|\| | | | | | | Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
| * Give up earlier on MIPS64 and don't tell users it is supportedAllan Sandfeld Jensen2017-09-051-2/+3
| | | | | | | | | | | | | | | | | | Chromium doesn't currently build on MIPS64, so we shouldn't tell people it might work. Task-number: QTBUG-62655 Change-Id: I56e798cae6914cc8087f1a6a51f07383e81f86c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:58:31 +0000