summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Clean up WebEngineAction APIPeter Varga2018-09-208-77/+71
| | | | | | | | | - Rename iconText to iconName - Remove unused QQuickWebEngineAction::toggled signal - Remove argument of QQuickWebEngineAction::enabledChanged signal Change-Id: I37172c096003eea58e567753265abd91679dacf1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-09-1741-52/+270
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_common.pri Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
| * Set arm_arch as wellAllan Sandfeld Jensen2018-09-131-0/+1
| | | | | | | | | | | | | | Either overlooked or added after we make the GN switch. Change-Id: I93bfc27c2e71165901c2046ab2ea902d9dad39d3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-099-30/+108
| |\ | | | | | | | | | Change-Id: Idee34fa6d4cc54effd84d3b78e3666fa7fcce8db
| | * Fix no-opengl builds on windowsv5.11.2Allan Sandfeld Jensen2018-09-041-1/+1
| | | | | | | | | | | | | | | Change-Id: I134876aa68bd42356c0b897a5d7d5881f27724a4 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Update changes-5.11.2Allan Sandfeld Jensen2018-09-041-0/+6
| | | | | | | | | | | | | | | | | | | | | Add a few missed changes from 3rdparty Change-Id: Ie503da76d20440729516224c48bf0c95aade66d7 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Add changes file for Qt 5.11.2Antti Kokko2018-08-311-0/+72
| | | | | | | | | | | | | | | | | | Change-Id: Ia3fe234353e489732ee5f914204ee3f46c894a52 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Merge 5.11 into 5.11.2Frederik Gladhorn2018-08-2731-22/+158
| | |\ | | | | | | | | | | | | Change-Id: Iea03d76799b1e94991e536c056a5b918d63041a4
| | * | Document world ID limitAllan Sandfeld Jensen2018-08-274-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The max was bumbed from 11 to 256, now document it. Task-number: QTBUG-69904 Change-Id: I6cbf64afe3409c4722d7a903d833124880b32bc0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Update ChromiumJüri Valdmann2018-08-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following changes: * 708511 Fix hunspell::NodeReader::affix_id_for_leaf bounds check Change-Id: I54a3775c171361f227a27bfd3846ab4f5a78e76c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Remove check for catalog support in libxml2Jimi Huotari2018-08-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes have been made upstream, backported in http://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=65-based&id=eb5360b2 that make it possible to link against system libxml2 again, even if it has been compiled with catalog support. Thanks to Arfrever Frehtes Taifersar Arahesis for their help on this. Change-Id: I61a49ab806f6dbbd96a2df09946c1a14062e6df5 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | Fix build against Qt 5.9Jüri Valdmann2018-08-221-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow it's the case that QtTest 5.9 doesn't know how to QCOMPARE a QString with a normal string literal: ld: error: undefined symbol: bool QTest::qCompare<QString, char [31]>(QString const&, char const (&) [31], char const*, char const*, char const*, int) Change-Id: I13ce50689d9f1c157378b862fb1ed4a572ac7f79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Update ChromiumMichael Brüning2018-08-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following changes: * 084a80 [Backport] Security Bug 831117 2/2 * f78390 [Backport] Security Bug 831117 1/2 * d739b9 [Backport] Security Bug 683418 * cf51b5 [Backport] Security Bug 840695 * 009019 [Backport] Security Bug 838886 * 424911 [Backport] CVE-2018-6158 * 6d5f60 Fix compilation issues in introduced previous commits * a6e2ca [Backport] Security fix for Chromium bug 860721 * 3e6d0c [Backport] Security fix for Chromium bug 839197 * f4115a [Backport] additional patch for security fix for Chromium bug 839197 Task-number: QTBUG-69663 Change-Id: I6ad8509efb210972b753d8763e02cc31e90e0f8a Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * | | Disable LTCG for Qt WebEngineCoreAllan Sandfeld Jensen2018-09-061-0/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | We do not have it working together with the building of Chromium. Task-number: QTBUG-66571 Change-Id: Ib000a4102b02902f2ac257347e406297fe1608cf Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Document Tango icons used in examplesKai Koehne2018-08-2131-22/+158
| |/ | | | | | | | | | | Task-number: QTBUG-62053 Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Correct cert to certificateAllan Sandfeld Jensen2018-09-127-31/+31
| | | | | | | | | | Change-Id: I7534aa6cd0c2a95403ad997095d5de76216f228e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix issues with qml bindings accessing non-existing adapterMichal Klocek2018-09-1213-83/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have currently two levels of initialization for WebEngineView: the profile initialization and the adapter initialization. The adapter initialization is delayed to first navigation request to pick the right initial site instance and avoid creating dummy/blank WebContents, which in turn would start unnecessary render process. Profile initialization is delayed to make sure we avoid unnecessary default profile creations. Created profiles use filestorage. Unfortunately qml will call QQuickItem::componentComplete() only when the root element is completed and the bindings can be already in use by that time. Profile initialization has to take place before adapter initialization. Construct adapter together with WebEngineView, but create and initialize profile before adapter initialization. Go through WebEngineView and fix emitting signals based on adapter initialization. Most of the signals are emitted on initializationFinished(). Task-number: QTBUG-70248 Change-Id: I2acd8bff761c692a360733cbf537de53e1295695 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Improve QWebEngineUrlScheme APIJüri Valdmann2018-09-128-62/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following feedback from 5.12 API review: - Use enum class for Syntax - Add Q_FLAG for Flags - Mark constructor from name as explicit - Rename Secure to SecureScheme - Rename Local to LocalScheme - Rename addScheme to registerScheme - Rename findScheme to schemeByName Task-number: QTBUG-70247 Change-Id: Iae332c8d9843349506e8a4b07d70f0d234597375 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Extract Compositor from RenderWidgetHostViewQtv5.12.0-alpha1Jüri Valdmann2018-09-115-93/+303
| | | | | | | | | | | | | | | | Split compositing-related functionality from RenderWidgetHostViewQt into a new class Compositor. Change-Id: I97b26a6057734cd8ce8c1df29b373888f7a07c1c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix focus for inputmethods manual testPeter Varga2018-09-061-0/+2
| | | | | | | | | | Change-Id: I9e154fd94a2d6e9dacb80efba2c4a6ff260e9514 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | WebUI example: Reduce duplicationsKai Koehne2018-09-063-7/+15
| | | | | | | | | | | | | | Declare scheme name and about URL in one place. Change-Id: Id8eb69f2a8516dd21e6abedc2adda828a5a9e18c Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix libvpx config testsThiago Macieira2018-09-061-1/+1
| | | | | | | | | | | | | | It'll never pass unless the code is valid C++. Change-Id: I8b4ab98c34b94afd94b6fffd15516ec82d79bf17 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Update ChromiumJüri Valdmann2018-09-051-0/+0
| | | | | | | | | | | | | | | | | | | | This pulls in the following changes: * 79e2dad9 [Backport] Skip deleted object files in POSIX base::debug::StackTrace * 3779b31a Fix hunspell::NodeReader::affix_id_for_leaf bounds check Change-Id: Ib8e9925e66c9730016141c09c32453b6aaaa5186 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Avoid reattach of page before deleting itAllan Sandfeld Jensen2018-09-054-9/+25
| | | | | | | | | | | | | | | | | | Also fixes potential double delete if you do delete a view's implied page. Change-Id: Ib74128c0801f992694f4a5d8c148974039a6c7b2 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Zakor Tamas <ztamas@inf.u-szeged.hu>
* | 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>
* | Fallback to Latin-1 if ASCII and UTF-8 doesn't workAllan Sandfeld Jensen2018-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | Latin-1 is a standard fallback for HTTP headers, but no one that HTTPContentDisposition::Parse considers by default. Task-number: QTBUG-70288 Change-Id: Ife36fffe31da5492cde49a4d447cfc42b3f64b95 Reviewed-by: Zakor Tamas <ztamas@inf.u-szeged.hu> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix QWebEngineUrlScheme::operator== constnessJüri Valdmann2018-09-042-4/+4
| | | | | | | | | | | | Task-number: QTBUG-70247 Change-Id: Ic0898966d9a88a0bbcdf749c6ea7e80e054d68a3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update plugins.qmltypesKai Koehne2018-08-302-13/+17
| | | | | | | | | | | | | | | | | | By running qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.8 >plugins.qmltypes Change-Id: I0d3bce858594bd6f6958b329c9c3a939462329bd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Bump import to "QtWebEngine 1.8"Leena Miettinen2018-08-301-2/+2
| | | | | | | | | | | | Task-number: QTBUG-70246 Change-Id: I8f56c6ee63fb9b0660558a91c4583961ca0d6946 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Doc: Add missing . to property descriptionKai Koehne2018-08-291-1/+1
| | | | | | | | | | Change-Id: I694749ec57caa70ee5a6196684b196e84421ff6e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Return http status code for successfully loaded pagesErwin Kandler2018-08-292-3/+7
| | | | | | | | | | | | | | | | | | WebEngineView supports getting the http status code (error code) for failed loading requests only. This patch lets the user access the status code for successfully loaded pages as well. Change-Id: Ib8dbdfe94eed4d62e731c736c13f60ebd62a23fa Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Update libvpx config testJüri Valdmann2018-08-291-7/+8
| | | | | | | | | | | | | | | | | | | | WebRTC requires a newer, unreleased, version of libvpx. The config test should detect it once it has been released. Until then the bundled version must be used. Task-number: QTBUG-70183 Change-Id: Ie97319d3f9560e44ebc823fc07a481696a82648e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix initial url in quicknanobrowser and minimal examplesMichal Klocek2018-08-282-2/+2
| | | | | | | | | | | | | | | | There is no qt.io. Use www.qt.io. Use https. Change-Id: I1bf44a3c99cbb50b93875d88881cbdfb083f27c5 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix build without webchannelKai Koehne2018-08-281-0/+2
| | | | | | | | | | | | | | Amends c4cded3fd5ba64. Change-Id: Ie0e01440e071ca01c6677a793ce0cc5f3f640ec7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | WebEventFactory: Use QKeyEvent::key() if QKeyEvent::text() is emptyJüri Valdmann2018-08-271-13/+52
| | | | | | | | | | | | | | | | Fixes missing dom_key issue when ControlModifier is used on Linux and macOS. Task-number: QTBUG-69442 Change-Id: Icd644d019494fd3c95269b42c71efd747507a3ea Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebEventFactory: Fallback for WebKeyboardEvent::dom_codeJüri Valdmann2018-08-272-1/+33
| | | | | | | | | | | | | | | | | | | | Usually this field should be computed from the native scan code, but sometimes we do not have a native scan code (in tests, for example). Add a fallback case to compute this field from windows_key_code, with test. Task-number: QTBUG-69442 Change-Id: I046094032576f4215cc8b3a6ced699a86ea148a9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebEventFactory: Fix WebKeyboardEvent::dom_code on macOSJüri Valdmann2018-08-271-5/+8
| | | | | | | | | | | | | | | | | | | | | | Currently this field is always computed from QKeyEvent::nativeScanCode, but this is not correct on macOS where nativeVirtualKey should be used instead (there is no nativeScanCode on macOS). Fix by using native_key_code which already takes this into account. Task-number: QTBUG-69442 Change-Id: I7c99d7d147ab68bac7ab91101de173eb04fa5c03 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebEventFactory: Fix WebKeyboardEvent::native_key_code on Windows and LinuxJüri Valdmann2018-08-271-1/+25
| | | | | | | | | | | | | | | | | | Currently this field is filled from QKeyEvent::nativeVirtualKey, but this is correct only on macOS (cocoa). Other platforms should use nativeScanCode. Task-number: QTBUG-69442 Change-Id: I097ec4c726a9d249c0adfbc620d2585983f6246c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebEventFactory: Use runtime platform detectionJüri Valdmann2018-08-271-6/+40
| | | | | | | | | | | | | | | | | | Make sure that the platform specific code paths are only taken when the relevant QPA plugin is actually used. Also detect if eglfs plugin is using Xkb key codes. Task-number: QTBUG-69442 Change-Id: I9546b61ad8d9f15020a96f8c0006d056aa157fcc Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | WebEventFactory: Consistently unswap Control and Meta on macOSJüri Valdmann2018-08-271-30/+44
| | | | | | | | | | | | | | | | | | Move swapping logic to separate helper functions and use them also for filling out windows_key_code and dom_key. Task-number: QTBUG-69442 Change-Id: Id3b883b28b877d54315c5e2fb0d77bad250f2462 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add more error output to qwebengine_convert_dictJüri Valdmann2018-08-271-12/+28
| | | | | | | | | | | | Task-number: QTBUG-70034 Change-Id: Ia1c18845f480225e3f50cf7199cdf85a3fb4f158 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Do not force default profile on WebEngineViewMichal Klocek2018-08-254-25/+58
| | | | | | | | | | | | | | | | | | Do lazy initialization for WebEngineProfile on WebEngineView. Fix unnecessary creation on default profile on destruction. Task-number: QTBUG-66068 Change-Id: I9a5889387ac64f0dc718a9e105c8d498aed47a43 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Replace RenderWidgetHostViewQt::m_host by RenderWidgetHostViewBase::host()Tamas Zakor2018-08-242-40/+38
| | | | | | | | | | Change-Id: I327c2459e803602dae107defec8d03d75f363cd7 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | WebContentsAdapter: Fix build against Qt 5.9Jüri Valdmann2018-08-231-6/+7
| | | | | | | | | | | | | | QTimer::singleShot wants to copy the lambda but LoadURLParams is not copyable. Change-Id: I300b70eef0041294080a15166a50321bb4292cfd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | tests: Fix build against Qt 5.9Jüri Valdmann2018-08-232-7/+7
| | | | | | | | | | Change-Id: I9a6b4e7625700c1ff2621f4e2a2125727c34d3a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Clean-up of forward declarations and includes in core headersTamas Zakor2018-08-234-13/+0
| | | | | | | | | | | | Change-Id: Icf0508baf0884afe7591b35e13733b17c9fdfe90 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add webui exampleJüri Valdmann2018-08-239-1/+558
| | | | | | | | | | | | | | | | | | Example of using QWebEngineUrlScheme and QWebEngineUrlSchemeHandler. Change-Id: I1316831600e7c9b8f7ca7b205ecb3c29bfcdcd84 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | DelegatedFrameNode: Use QSGTexture::filtering()Jüri Valdmann2018-08-231-17/+9
| | | | | | | | | | Change-Id: I5ab52de1eb6bd7a25e8b680f4779a505e3f1fcf0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Allan Sandfeld Jensen2018-08-2247-197/+2034
|\ \ | | | | | | | | | refs/staging/5.12
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Michael Brüning2018-08-2147-197/+2034
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 17:20:49 +0000