summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.6Oswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: I604af2b8986bcd36a14281c9a20bfec4ec733ff1
* Add change file for Qt 5.6.3v5.6.3Antti Kokko2017-09-061-7/+19
| | | | | | | | | Imported and expanded from 5.6 branch Task-number: QTBUG-62705 Change-Id: I89d060d18fec20eeb255625b8c78520163aeb83d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 38f816a443a384aaaacc932de99bfdf30bcc469f)
* Update ChromiumMichal Klocek2017-08-011-0/+0
| | | | | | | | | | | Pulls in security patches from Chromium 57 (29th March): * cb094c0 Fix broken debug build introduced in security backport * 9966a98 [Backport] CVE-2017-5054 * 2c15cc0 [Backport] CVE-2017-5052 Change-Id: Icedc28e7c5396f1e09c4e05233f49d30783d3ad4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Chromium with security patches part 3Alexandru Croitor2017-07-121-0/+0
| | | | | | | | Contains the following security patches: 953ac71439 [Backport] Fix for CVE-2017-5059 Change-Id: I722f75b86c6a51e82ce4dda2c12105550e21aa8e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update Chromium with security patches part 2Alexandru Croitor2017-07-111-0/+0
| | | | | | | | | | | | | | | | Contains the following security patches: 2d14bca522 [Backport] Fix for CVE-2017-5076 c99afcd115 [Backport] Fix of CVE-2017-5061 and CVE-2017-5067 77aea3903d [Backport] cerry-pick fix for uninitialized memory in flac f742469506 [Backport] Update expat to 2.2.0 to fix CVE vulnerability. bed113bd85 [Backport] Fix for CVE-2017-5069 b950ebe7c0 [Backport] Fix for CVE-2017-5065 19ed073bf7 [Backport] Protect against lifecycle updates that delete a layout object for autoscroll. ac5d2f8fc6 [Backport] Fix for CVE-2017-5062 Change-Id: I4e8b888f466da25d1b6493689b20620a0cca8e52 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update Chromium with security patches part 1Alexandru Croitor2017-07-081-0/+0
| | | | | | | | | | | | | | | | | Contains the following security patches: 41c2071163 [Backport] Fix for CVE-2017-5089 7976efd28c [Backport] Fix for CVE-2017-5083 a8e8840888 [Backport] Fix for CVE-2016-5078 f462acffbc [Backport] Fix for CVE-2017-5071 409d8a2c1c [Backport] Flowthread should move its floatlists to container when evacuating cca1687647 [Backport] avformat/oggparseogm: Check available data before reading global header 70418264d9 [Backport] Fix for CVE-2017-5070 5636374d4c [Backport] Fix for CVE-2017-5075 Change-Id: Iae660395f6ac761357e6369fb17e54ca1cb3d881 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2017-05-291-0/+0
| | | | | | | | | | | | | | | | Pulls in security patches from Chromium 57 (9th March) d540bef6 [Backport] CVE-2017-5029 defc5379 [Backport] CVE-2017-5037,CVE-2017-5047,CVE-2017-5048 CVE-2017-5049,CVE-2017-5050,CVE-2017-5051 7632de2b [Backport] CVE-2017-5033 0892abb3 [Backport] CVE-2017-5044 f9e4596a [Backport] CVE-2017-5046 ea586408 [Backport] Follow-up CVE-2017-5010 e2ac3f69 [Backport] CVE-2017-5017 Change-Id: I666e682fbc7d4098c94d76f06472f9e1f752d213 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2017-05-031-0/+0
| | | | | | | | | | | | | | Pulls the second round of the security patches from Chromium 56 a0b159a [Backport] CVE-2017-5007 1696ed0 [Backport] Rename blink::Page's load deferral to suspension 25c5b8a [Backport] CVE-2017-5023 e49d4ec [Backport] CVE-2017-5025, CVE-2017-5024 63c4659 [Backport] CVE-2017-5027 e580020 [Backport] CVE-2017-5026 Change-Id: Ic10fdcedfb85c6bf3664e890269c987c7e815e67 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumAllan Sandfeld Jensen2017-04-201-0/+0
| | | | | | | | | | | | | | | | | | Pulls in the first of the security patches from Chromium 56 Changes: 64fdd31 Fix build with GCC 7.0 f1da809 [Backport] CVE-2017-5006 de52fee [Backport] CVE-2017-5008 4d49976 [Backport] CVE-2017-5009 804d277 [Backport] CVE-2017-5010 af12886 [Backport] CVE-2017-5012 9aa0fba [Backport] CVE-2017-5015 1feaad9 [Backport] CVE-2017-5016 1db3712 [Backport] CVE-2017-5019 Change-Id: Ib6a35f0e2198f440ca25e028eecefbfc028ff4c7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update ChromiumAllan Sandfeld Jensen2017-03-282-1/+1
| | | | | | | Pull in the last of the changes of the Chrome 55 backports. Change-Id: I9f6bf3996045355b60841788d27c9379925a79a4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update ChromiumAllan Sandfeld Jensen2017-03-202-3/+3
| | | | | | | | | | | Pulling in two more security fixes Changes: 5bb09b5 [Backport] Use safe math in ValidateCopyBufferSubData. 1e16422 [Backport] Use better fallback URLs when calling AVScanFile(). Change-Id: I2f80ae127b44468c79f47f4563809312ccfe57b1 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Update ChromiumAllan Sandfeld Jensen2017-03-202-1/+4
| | | | | | | | | | | | | | | | | | | | | Pulling in most of the security patches from the Chromium 55 release Changes: 5764d98 [Backport] Update mix bus carefully for MediaStreamAudioDestinationNode a5df454 [Backport] Enforce form-action CSP even when form.target is present. 3fff9e5 [Backport] Walk up frame tree for srcdoc referrer policies 37f6cbe [Backport] cc: disable denorm handling before calling into Skia's filter code. d194a32 [Backport] Don't run handleEvent getter in V8EventListener::getListenerFunction if script is forbidden. 965db0d [Backport] Merge: "INPUT element: Do not dispatch events in detachLayoutTree()." to M55 branch. 062a75e [Backport] Disallow frame swap during frame detach. 00c30cd [Backport] Don't send loading completion callbacks for detaching frames. 2f62aa6 [Backport] Drop navigations to NavigationEntry with invalid virtual URLs. 83cd7dc [Backport] Make Range::createAdjustedToTreeScope() to handle the shadow root at end of document tree correctly. 929be7c [Backport] [M55] Use FFmpeg default padding when allocating audio buffers. Change-Id: I61a158ada396edc82a118c969d359ab2df68b408 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add changes-5.6.3Allan Sandfeld Jensen2017-02-201-0/+58
| | | | | | | Mention the merge from 5.7.1 and list the fixes thereby gained. Change-Id: I8000a3bddfaed612e91ed2e92445e255b2262bde Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Speculative fix of user script QML testsPeter Varga2017-02-161-9/+9
| | | | | | | | | | The sequence of the titleChanged and loadingChanged signals is not guaranteed. Wait for both of them to avoid flaky behavior. Task-number: QTBUG-58940 Change-Id: I981cd20f6535187fa0f8144db0084c8bb64ab41c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 25b50de487a34fb8ffcd6d891c833b2f2907c91c)
* Remove new API added in 5.7Allan Sandfeld Jensen2017-02-10132-5854/+1000
| | | | | | | | Return the API to what it was in 5.6 Change-Id: I25e7f321802cfd69017120d5645e93c6e0d2fd32 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.6Allan Sandfeld Jensen2017-02-10551-7540/+35536
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/web_contents_view_qt.cpp Change-Id: I7d9fbd3efcf8a3f8165244364d9528ddaf3cdbda
| * Merge remote-tracking branch 'origin/5.7.1' into 5.75.7Liang Qi2017-01-161-2/+3
| |\ | | | | | | | | | Change-Id: Iec696e265a70a2aed6e58908e8048a126fa77515
| | * Disable surfaceless context supportv5.7.1Michal Klocek2016-12-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using surfaceless EGL surface on imx6 embedded device crashes webengine with backtrace in gpu driver. Since this feature requires a bit more testing on embedded platforms disable support for the 5.7.1 release. Task-number: QTBUG-57290 Change-Id: I3ed5b6fc173d184486316a2c3d899a88d4b1de76 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Increase timeout in loadSignalsOrder testsAllan Sandfeld Jensen2016-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a standard QTRY_VERIFY. Apparently launching the web-process might sometimes take more than 500ms on the CI under load. Task-number: QTBUG-57119 Change-Id: Icb7706b5aed3cf72f026af6d1d2f9430c4942a2a Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-11-2411-13/+111
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
| * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Allan Sandfeld Jensen2016-11-215-9/+78
| |\ \ | | | | | | | | | | | | Change-Id: Ifcf7423fa8d892ddad595300e33a09c7f63f5e6e
| | * | Update ChromiumAllan Sandfeld Jensen2016-11-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in the security fix from Chrome 54.0.2840.87 Change-Id: I70064927cba01b7978742951ba0636b780d9eb68 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * | Update changes file for 5.7.1Michael Brüning2016-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib683ecda4c4bb2d58f36ad92f703d58f00e9d445 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | Do not call QOpenGLContext::openGLModuleType() from MainDllMichal Klocek2016-10-261-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of dynamic OpenGL on Windows this ends on calling QWindowsIntegration::staticOpenGLContext() from MainDll which in case of angle will end up badly. Add warning message when webengine is loaded from plugin and context is not initialized. Task-number: QTBUG-52201 Task-number: QTBUG-55501 Task-number: QTBUG-56020 Change-Id: I03570cad5f686c4a63910c71136bf3eb9499f223 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Update ChromiumAllan Sandfeld Jensen2016-10-172-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in security fixes from the Chromium 54.0.2840.59 release, Changes included: - Fix renderer crash on null family strings - [Backport] Blink-in-JS should not run micro tasks - [Backport] Disallow reentrance of FrameView::updateLifecyclePhasesInternal() - [Backport] Check CORS policy on redirect in TextTrackLoader - [Backport] Keep top controls visible if SHOW is called right after HIDE. - [Backport] Merge to 2840 "[DevTools] Avoid current_ and pending_ being the same host in RenderFrameDevToolsAgentHost." - [Backport] Enable do not allow default action for untrusted events. - [Backport] Compare font-feature-settings as part of Font::operator==(). - Stop the flood of accessibility messages - [Backport] Fix for hitting an assert when refreshing a page with an image - [Backport] Report the decoded size to ImageObserver, instead of deltas Change-Id: I142cc070ba7fb215e4a5b9c162852b583dab9784 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Add changes for 5.7.1Allan Sandfeld Jensen2016-10-171-0/+51
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec54a4a3a117ce5f6bca8ff22218eb8fea0008e8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * | Fix nullpointer dereferencing errorViktor Engelmann2016-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether iconUrls is NULL before calling contains(iconUrl) on it, which, under certain circumstances, caused a SEGFAULT. Task-number: QTBUG-56330 Change-Id: Ia167d68a4c4d62af4740a8cbab2686bfbc975455 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| | * | Update ChromiumAllan Sandfeld Jensen2016-10-121-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6803569bd7bee4bf8eb94f61771ea2a318eb752b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | Fix crash in WebEngineContext when using WaylandAllan Sandfeld Jensen2016-10-121-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the OpenGL context wayland QPA sets has no nativeHandle, so we end up crashing in strcmp. Assume a context without nativeHandle is Wayland or other GLES2 platform and also force GLES2 when using Ozone. Change-Id: Ia3fc524f3ffbb278d86f9153ec96c7258ef86656 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | Pass size to URLRequestJobAllan Sandfeld Jensen2016-11-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QIODevice has a size we can pass that on as expected size. This fixes media playback where Chromium does not always support streaming outside of HTTP or HTTPS. Task-number: QTBUG-57139 Change-Id: Ie8bf96b1f7f6af80fe707936055620d154c3ef2d Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | | Fix sites with optional client certificate supportAllan Sandfeld Jensen2016-11-102-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fail to load pages that supports client certificates because we didn't implement the client certificate selection. This patch makes a small implementation that selects no certificate whenever a client certificate is requested. Task-number: QTBUG-56206 Change-Id: I95394d9664c7e8e4d03d9e63e5043da81e2672a4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | Make Linux QPA combinations more robustAllan Sandfeld Jensen2016-11-092-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use resourceForIntegration to get egldisplay since not all QPA return a egldisplay for context (in particular xcb_egl). Implement EGL fallback for linux desktop builds, to make Wayland work without an X11 server present. Change-Id: Idcead42250fa00a36e50c082711f5618fd213556 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Michael Brüning2016-11-092-16/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to update QWebEnginePagePrivate to match modified WebContentsAdapter API in 5.7. Conflicts: src/webenginewidgets/api/qwebenginepage.cpp Change-Id: If3da3b4db9dc27e5d6aae1e31a4e7b45c435697e
| * | | | Do not fail for wayland-eglMichal Klocek2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client-side buffer integration can be set manually, therefore beside accepting generic wayland plugin accept also wayland-egl. Change-Id: I8269f117f81cf8bb9462bea525cb253727910bc6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0411-31/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc, use the macro \macos. Conflicts: src/core/media_capture_devices_dispatcher.cpp src/webengine/doc/src/qtwebengine-deploying.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
| * | | | | Add missing override to initializeEngine in pluginMichal Klocek2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-56870 Change-Id: I36338a1a29bc4e82f5c84cfa1ea641b8df3b5f4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Apply page margins also for PDF printing (backport from 5.8)Michael Brüning2016-10-281-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was left out by oversight. Task-number: QTBUG-56710 Change-Id: Ie23229396eb94b949212324fb50022763935d524 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | | | Prevent crash with overridden drag 'n drop event handlersJoerg Bornemann2016-10-262-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose the user overrides QWebEngineView::dragEnterEvent without calling the base implementation and without overriding dragLeaveEvent. Then our implementation will notify chromium about the drag leave without having ever seen a drag entering and crash. Only notify chromium about leave/drop/move events if we've notified it about the drag enter before. Also, catch the case where the user overrides dragLeaveEvent without calling the base implementation. Task-number: QTBUG-54896 Change-Id: Ib958040e5fa7ecab86bac9b724d478c81a521fcc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | | | Fix hang when dragging files from file picker onto QWebEngineViewJoerg Bornemann2016-10-262-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method WebContentsAdapter::updateDragPosition actively waits for the UpdateDragCursor message, sent by the renderer. This active wait does not work whenever we're currently in a base::MessageLoop::RunTask call, because of its internal recursion guard nestable_tasks_allowed. Add a check for nestable_tasks_allowed and bail out if we know that the active wait will fail. This fixes the hang. Ensure that the modal file picker dialog is shown outside of base::MessageLoop::RunTask. This enables drag 'n drop updates from the file picker to QWebEngineView. Task-number: QTBUG-56488 Change-Id: Ia13ada9c19e7780e12ca633ab1caeac352aca2a9 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | | | Forward more load parameters in OpenURLAllan Sandfeld Jensen2016-10-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a number of missing load url parameters following the example of the shell and android webviews in Chromium. Change-Id: Ice27ab3efc550b8b7cfa6a5386aaf09574428a56 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * | | | | Give better error on unsupported platformsAllan Sandfeld Jensen2016-10-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check for our supported and semi-supported platforms. Task-number: QTBUG-56465 Change-Id: Ic2f934ceac1b21ab5c688fa67e1c1a74ddf4a43b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | | | Respect command-line flags overriding our embedded defaultsAllan Sandfeld Jensen2016-10-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the opposite flag has been given by the user before adding our own defaults. Task-number: QTBUG-56432 Change-Id: I7d6b8fed2c3e20405e3986f9afeb2193751a93f3 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | | | Consider multiple contents in mimeDataFromDropData conversionViktor Engelmann2016-10-111-9/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content::DropData can have multiple contents (e.g. an <img> tag has itself as .html property, but also the src="..." attribute as .url property. Therefore, we should always consider all 3 cases and not return immediately when we have found the first content. Task-number: QTBUG-55858 Change-Id: Ie13851e8edb9ada45184a19b6ccfe38839bb9923 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Doc: Set the correct indexTitle for C++ Classes pageTopi Reinio2016-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and mention namespaces in the title, listing the namespaces with a group selector. Change-Id: I06056beba464a441ab56cb0acbfb0440c0878f0d Task-number: QTBUG-56298 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | | | Speculative stabilization of tst_QWebEnginePage::testJSPromptAllan Sandfeld Jensen2016-10-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we start in a well-defined state, and is not in process of setting up the blank page. Change-Id: I787db2ef75323bb72a5a6c6fd2e66b268f89b16d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-045-5/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| * | | | | Fix flaky tst_QQuickWebEngineView::printToPdf test by using QTRY_VERIFYMichael Brüning2016-10-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55857 Change-Id: Ieb7fe836e7b03bea28dd97bcad343708a5be2cb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Update ChromiumAllan Sandfeld Jensen2016-10-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in changes to build debug+release correctly, build with Xcode 8, and added support for running on macOS 10.12 Sierra. Change-Id: I17668229c1b90af9dca26fb48f6cf945ef0ed114 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-09-255-12/+14
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-245-12/+14
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:54:27 +0000