summaryrefslogtreecommitdiffstats
path: root/src/core/configure.json
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-10-221-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.json src/3rdparty src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h src/core/login_delegate_qt.cpp src/core/login_delegate_qt.h src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/qtwebengine.gni 3rdparty changes: 616a7f558c7e This is expected for us, so don't report it as an error. c30febceaa1b Do not write <protocol>.json to source directory 9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error. f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used 5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium 34f52ec3bae8 Bump maximum number of custom isolated world ids f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check 1e80090f7044 Fix resolve_proxy service permissions 2e498629651d Add proxy_resolver_manifest Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
* Add kerberos feature to configure systemMichal Klocek2018-10-171-0/+9
| | | | | | Task-number: QTBUG-51082 Change-Id: I2c3ed5b42b054a9385f358eb9311646bc2a6cde0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-271-0/+15
| | | | | | | | | Conflicts: configure.json configure.pri src/3rdparty Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
* Remove more dead code from the libsrtp testThiago Macieira2018-09-051-11/+0
| | | | | | | | | Commit 83e790dae14725347180bb79e463c5f242616b8d removed the test, but not the configure.json files, so the test always failed because the test failed to compile. Change-Id: I8b4ab98c34b94afd94b6fffd15516f06ec21c791 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make WebChannel an optional featureMichal Klocek2018-08-091-0/+9
| | | | | | | Add webengine-webchannel feature. Change-Id: I600572180f8169aafe79cf0408527cc087d9a007 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Add printToPdfPoppler testMichal Klocek2018-08-091-0/+12
| | | | | | Task-number: QTBUG-69550 Change-Id: I38fb8a32ad1967fc8a8568ad6c02ca3ca3000354 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Use ozone for x11Michal Klocek2018-08-021-2/+13
| | | | | | | | | | | | | | | | | | | | | 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>
* Add missing verbose label for nss checkMichal Klocek2018-07-181-1/+1
| | | | | Change-Id: I1003cc075d87b7e44088512d6f548a917bea1b45 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Linux: Check for libnss versionKai Koehne2018-07-161-1/+1
| | | | | | | | | | | | src/3rdparty/chromium/crypto/nss_util.cc has a static assert for NSS_VMAJOR, NSS_VMINOR: static_assert((NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || (NSS_VMAJOR > 3), "nss version check failed"); Task-number: QTBUG-69428 Change-Id: I034ad3208babd83fc8ceea30dab01b5200edc91b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Print macOS toolchain info when configuring WebEngineAlexandru Croitor2018-07-111-0/+30
| | | | | | | | | | | | | It's not always easy to determine what Xcode / clang version is used when building WebEngine in the CI. Same for the OS version and other toolchain details. Print out the values at QtWebEngine configure time. This will also help us when users provide build logs. Change-Id: I413a6c5b6efb42c4411268ca46d07c2fb9b85cc3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devAllan Sandfeld Jensen2018-06-261-1/+13
| | | | | | | | | | Conflicts: .qmake.conf configure.json src/3rdparty tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Id79ff6cf01c2db3a2044881ddcbf044abdf84936
* Adaptations for Chromium 67Allan Sandfeld Jensen2018-06-261-1/+1
| | | | | Change-Id: I13cedba56012f74651a044d6fa8f0957487bf3eb Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix webengine geolocation featureMichal Klocek2018-06-181-1/+1
| | | | | | | | | | | Use feature check in the configuration and in the implementation files. Make feature public, so developers can check if webengine was complied with or without geolocation. Change-Id: If679b5c366074c2f48fad5ba189870571567fe81 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fine tune configure and clean up header includesMichal Klocek2018-06-121-0/+722
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 11:21:12 +0000