summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Clean up platform testsMichal Klocek2019-09-191-1/+1
| | | | | | | | | | | | | Make it a private feature so test is not run twice. The better solution would be to split the platform test into separate tests in configure, but it looks like a lot of boring typing and would result in bunch on private features. Instead run test only on configure step and in case of fail just export the error, so it is reported during configure and make calls. Change-Id: Ice1188631a53fe739569de3e303533b18342941a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Unify error reporting for configureMichal Klocek2019-09-191-107/+0
| | | | | | | | | | | | | | Move last two tests (submodule and nowhitespace) to configure system and unify error reporting. Now all error messages come from one single place qtwebengine_checkErrors(). This function is used by configure system reporting and by make call. Remove duplicated strings. Add extra messages when module is not going to be built. Change-Id: Ib373facd58135325495aad52b6e600ec9a61f31f Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* FIXUP: Fix platforms check for topLevel buildMichal Klocek2019-09-192-193/+23
| | | | | | | | | | | | In case of a top level build configure.pri is not able to load platform.prf. Move platform.prf to platfrom.pri and use include instead. Fix not loaded qconfig.pri with gcc versions. Make sure there is no function name collision. Change-Id: I2c9994197dc56371fd7ef215ab350aebb89ff701 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add platform and architecture to configureMichal Klocek2019-09-172-9/+7
| | | | | | | | | | Make configure system aware of platform and architecture checks. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I8d2c9dd863ee2c4a3015ad8147f43dc788cfd72d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Refactor platform checksMichal Klocek2019-09-172-39/+55
| | | | | | | | | | This simply rewrites isPlatformSupported to be easier to read. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I3aab893f2f6db88928eda00d0db650150c7ccf2c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move gn configs out of coreMichal Klocek2019-09-071-3/+3
| | | | | Change-Id: Ib047e35191faa627211c759bff4e81bfaec3d685 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move main configure and move some tests from core to buildtoolsMichal Klocek2019-09-072-3/+4
| | | | | | | | | | | | | | | | | | Processing configuration for gn when building qpdfcore module will require optional libraries resolved. Some libs are not needed, but this requires extra patching of gn build configs; so to keep things simple, just detect all the libs beforehand. Unfortunately using this for main configure goes bonkers. The issue here is that main configure resets features in global scope, which can break features coming from qtbase and results in bogus configurations in certain cases. Therefore move current configuration to buildtools and make everything else depend on this. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: Id87f5ba017541a2d5a2836510c6cabc5a19f92c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add webengine-core featureMichal Klocek2019-09-073-111/+95
| | | | | | | | | | | | | | | | | | | | | | | | | Create/split main configure for submodules. Now configure system knows when webenginecore module is not going to be built and the user gets the feedback after the configure step with the message: The following modules are not being compiled in this configuration: webenginecore webengine webenginewidgets If a module is not built also features are not populated, therefore some tests have to be moved to main configuration. This improves error reporting and prepares landing for QtPdf modules. Remove configure.prf and fix issues after config split. Add makefile call to report errors. Now calling make also reports issues. Task-number: QTBUG-75840 Task-number: QTBUG-76606 Change-Id: I76944df4c5db6f4954c464e3741a8054cb10b40e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devAllan Sandfeld Jensen2019-07-242-15/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_chromium.pri tests/auto/quick/qmltests/BLACKLIST tests/auto/quick/qquickwebengineview/BLACKLIST tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tests/auto/widgets/qwebengineview/BLACKLIST Change-Id: I11b26f5eebde29c4c62247b90e11e3ae40789fe4
| * Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-07-232-15/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/config/common.pri src/core/configure.json src/core/net/url_request_qrc_job_qt.cpp src/core/ozone/surface_factory_qt.cpp src/core/web_contents_adapter.cpp Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
| | * 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 minimum Windows SDK version after 75-basedTamas Zakor2019-07-171-2/+2
| | | | | | | | | | | | | | | Change-Id: I3d5d31616ce3110a7eb59e901e73a95353a27b07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devJüri Valdmann2019-07-021-1/+1
|\| | | | | | | | | | | Change-Id: I806417dd7a6d2594a86ee49feedc4ad9ee48add2
| * | Add more robust glibc testMichal Klocek2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This test also works now when cross compiling. Change-Id: If73e16084cfbaf68ba515c2706d3ec2ec8eab8c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devAllan Sandfeld Jensen2019-06-061-23/+12
|\| | | | | | | | | | | Change-Id: Ib61d4087aa999ae93240be620496e60f4fa73f63
| * | Revert "Make .moc files jumbo built"Allan Sandfeld Jensen2019-06-041-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 87570b4e360ab62ef5791d5c23ddd36aaa07ba05. Reason for revert: Made QTBUG-59769 worse Task-number: QTBUG-59769 Change-Id: I616930145eb6f89d6167f10d5be56b2ae898f29d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devAllan Sandfeld Jensen2019-05-271-9/+0
|\| | | | | | | | | | | Change-Id: I70917458ba43c8fbf27fee2382eee42618588fe4
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-05-241-9/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/net/network_delegate_qt.cpp tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
| | * 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>
* | | Merge remote-tracking branch 'origin/5.13' into devAllan Sandfeld Jensen2019-05-093-15/+36
|\| | | | | | | | | | | Change-Id: I495adfcbb010ac29dc64e051c030a92d27859ca6
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into ↵Jüri Valdmann2019-05-031-0/+4
| |\ \ | | | | | | | | | | | | refs/staging/5.13
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-04-301-0/+4
| | |\| | | | | | | | | | | | | Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
| | | * 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>
| * | | Support clang_cl builds on WindowsAllan Jensen2019-05-022-2/+7
| |/ / | | | | | | | | | | | | Change-Id: I1f3e8fc378cfceda92ff17fcc7669c0f5d97c3f7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Make .moc files jumbo builtAllan Sandfeld Jensen2019-04-161-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | Split the moc generated sources to a separate source_set, and make it jumbo. Change-Id: Icdbe9e7fb57cc07d89b766ef9e8efc78ff67bc8b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Enable precompiled headers for qtwebengine corev5.13.0-beta2Allan Sandfeld Jensen2019-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium requires us to add a special config to enable precompiled headers. Note this still depends additionally on that the corresponding GN flag is also set. Changes in 3rdparty: 9401dc18ce02 Add precompiled object files to qmake link output 8ba90427ae5e Improve the issue with long file names on windows Change-Id: I6680232e17a5254d3ca53e5a40e6a15a6b7fc82d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Remove check for mirclient as it is no longer availableAndy Shaw2019-02-281-4/+0
|/ / | | | | | | | | | | | | A follow up of qtbase 8c73ddd8e3fb43cc22fa111b855ab1f9f5b83405. Change-Id: Ic5050353db83d9a88f5e1f5840a1fdce91d1619d Reviewed-by: Liang Qi <liang.qi@qt.io>
* / Remove directory parameter from gn_find_mocables.pyJüri Valdmann2019-01-221-2/+2
|/ | | | | | | | It's very unnecessary: the file parameters are already absolute paths. The script only works because os.path.join(dir, f) == f for absolute f. Change-Id: Iba80d5e743cf8f834ac1b051afe2ab815891c751 Reviewed-by: Michal Klocek <michal.klocek@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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 05:32:58 +0000