summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update Chromium5.5Allan Sandfeld Jensen2016-02-021-0/+0
| | | | | | | | Updates the chromium branch pulling in backported fixes from the 45-based branch. Change-Id: I6d9be02954f4e46690fdb2808979d1b0ec4bae8c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Doc: add documentation for the WebEngineScript itemLeena Miettinen2016-01-202-2/+68
| | | | | Change-Id: Ice1b0a403686b4a280b2709a79fe2ed18ace3ab6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update license header for qwebenginepage.cpp to LGPLv3Joerg Bornemann2016-01-141-21/+35
| | | | | | | This amends commit 3b4eec9b. Change-Id: I19e8a295fa7e64ff83c26b6965097bd0ae3cbf73 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update key code mappings using QtWebkit mappings as reference.Alexandru Croitor2016-01-121-7/+24
| | | | | | | | | Copy additional key code mappings from PlatformKeyboardEventQt.cpp. Also add a mapping for missing numeric keypad equals key. Change-Id: Ia6c4413795293be84bcd8ea9d981d8cdfb94509b Task-number: QTBUG-50401 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Send proper key codes for KeyEvents to WebKit.Alexandru Croitor2016-01-111-2/+4
| | | | | | | | | A few KeyEvents to key code mappings were incorrect or missing. Fix them. Change-Id: I74087768fddd467993f04ed8b4c2dc6345d20e8a Task-number: QTBUG-50354 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update chromium submoduleJoerg Bornemann2016-01-071-0/+0
| | | | | | | Pull in a Windows build fix and update linpng. Change-Id: Ifca13944d4f5b517f19e73f358f7b75a105bd9f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-226-0/+35
| | | | | | | | | | | | When opening a new tab by middle clicking on a link in a web page, two MouseMove events are sent to Chromium consecutively, without getting proper acknowledgment events, which causes further move events not to be handled properly. Fix consists in preventing the second move event from being sent. Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9 Task-number: QTBUG-50031 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix incorrect device pixel ratio used on startup.Alexandru Croitor2015-12-071-0/+6
| | | | | | | | | | | | Report the correct device pixel ratio to Chromium, when the QOpenGLWidget gets initialized. The initial value on startup is incorrect, because Chromium tries to query the screen information, before a relevant QWindow handle can be returned, and thus defaults to 1.0f. Change-Id: Ibbedd7b2915840f9716340e582aedbc13406f11a Task-number: QTBUG-49727 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Reuse or clean up HttpNetworkSession when (re-) setting a cache type.Michael Bruning2015-12-042-24/+81
| | | | | | | | | | | Not reusing or cleaning up the session led to race conditions which in turn lead to crashes and asserts. Reuse the session if parameters match, clean up and it recreate otherwise. Task-number: QTBUG-49397 Change-Id: I4f846a448b50d80a3cf7c4f9bb833fa6d64974d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix embedded Linux debug buildJoerg Bornemann2015-12-021-1/+0
| | | | | | | | | | | | The icu header files are picked up from src/3rdparty/chromium/third_party/icu, but the syroot's icu libs were linked. Do not claim to support linking against the sysroot's icu. This never worked properly in 5.5. Task-number: QTBUG-49693 Change-Id: I7dca37ecefbc5b1dabfadf86540442b8face8347 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix ninja for shadow builds on windows.Michael Bruning2015-11-301-2/+6
| | | | | | | | xcopy seems to behave differently for than cp when copying directories recursively. Change-Id: I5130a0642511fb796d9b32e0d4cd2cd2b9153dc0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Reassociate the web channel when setting a profile.Michael Bruning2015-11-251-0/+4
| | | | | | | | | The WebContentsAdapter gets recreated and the QmlWebChannel needs to be reassociated with the new adapter instance. Change-Id: I88494fd379c429f2ae98df95a22c04c334452088 Task-number: QTBUG-49521 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* fix crash on WebEngineNewViewRequest.openInJoerg Bornemann2015-11-241-0/+14
| | | | | | | | | | | | | | When calling WebEngineNewViewRequest.openIn with the WebEngineView that initiated the request, QQuickWebEngineViewPrivate::adoptWebContents would destroy the current WebContentsAdapter object. But this WebContentsAdapter implicitly holds the RenderHostViewImpl of the current call stack. Accesses to it after adoptWebContents is finished will crash. Fix the crash by deferred deletion of the current WebContentsAdapter. Task-number: QTBUG-47601 Change-Id: I3c229172511b4aed77632a0abefbe0265ebf1557 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Build ninja in the shadow build directory.Michael Bruning2015-11-191-9/+22
| | | | | | | | | Essentially makes a copy of the ninja sources to the build directory to be non-intrusive for src/3rdparty. Task-number: QTBUG-44002 Change-Id: I82a686abbfab2579462dcb57e10b16f71a3a0d4e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix loading user scripts from qrc filesJocelyn Turcotte2015-11-191-1/+2
| | | | | | | | | | | | QUrl::toLocalFile doesn't handle qrc:// URLs, do like QQuickImageBase instead and use a public utility function to does that conversion. This allows loading qtwebchannel.js and use it in subsequent user scripts. Change-Id: I4791abdc96a7cd1e65ff76b1adeab9f9b250b582 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* fix "open download" in demo browserJoerg Bornemann2015-11-181-1/+1
| | | | | | | | Open the downloaded file, not the directory. Change-Id: I61b3a8e6788bf26b1a446459ce8b38774f8c28a0 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Let new pages use the custom user agent settingKai Koehne2015-11-051-0/+1
| | | | | | | | | The default is UA_OVERRIDE_INHERIT, which means that it will only use the override value if there's a previous NavigationEntry. Task-number: QTBUG-48891 Change-Id: Id5269b5ad2a4b0a78379c2b7df3c3e901cd2a485 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix build on WindowsAllan Sandfeld Jensen2015-11-041-3/+1
| | | | | | | | We can't delete a scoped_refptr, but just returning should cause it to do so automatically. Change-Id: I7d7ba28d0264506d608f64847cbfb8a7cb63cf5e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* adoptWebContents: re-bind user scripts with new adapterChristophe Chapuis2015-11-021-0/+4
| | | | | | Task-number: QTBUG-48984 Change-Id: I87cb224899458ba8f2d0343ed98932cfc8a6947f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix frequent deadlocks on WindowsJoerg Bornemann2015-10-301-2/+8
| | | | | | | | | | | | With a desktop OpenGL build of Qt we encountered frequent deadlocks when creating OpenGL contexts. Initialize the context directly on the calling thread instead of the browser thread and do not synchronize with the browser thread. Task-number: QTBUG-48276 Change-Id: I0970c66cb230881cdc53f22d4a255ea08e6fe63a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Do not use system harfbuzz unless it is configured.Michael Bruning2015-10-302-0/+3
| | | | | | | Change-Id: I8d2aca1d3192be08295af57b08489bfefc8e0dc4 Task-number: QTBUG-49128 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Do not display context menu when pending event flag is false.Michael Bruning2015-10-291-2/+1
| | | | | | | | | | | | When an event filter is installed on the view, the right mouse click event may trigger Chromium to request a context menu even though the context menu events get filtered out. Removes a Q_ASSERT that would now never be triggered. Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06 Task-number: QTBUG-49092 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* adoptWebContents: re-associate webchannel with new adapterChristophe Chapuis2015-10-281-0/+10
| | | | | | Task-number: QTBUG-48984 Change-Id: Ief41fe9619f4300d7a0c25a57f09f5eefe3fca3d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix touch events coordinates when using custom devicePixelRatioChristophe Chapuis2015-10-271-5/+7
| | | | | | | Task-number: QTBUG-48766 Change-Id: Idcae6dc84829fe96db62c6cb30ab193873d36709 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Include memory leak fix in the 3rdparty submodule.Michael Bruning2015-10-231-0/+0
| | | | | | | | | Uses the backported fix from newer Chromium versions. Task-number: QTBUG-48822 Change-Id: If9c5746b350840ae1fdbd5331dd2abb8e6118b8a Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update qtwebengine-chromium sha1.Michael Brüning2015-10-141-0/+0
| | | | | | | This is needed to include a fix for windows developer builds. Change-Id: I341167adc89e1dec05180f48194c0c22b3a3a77a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Set off-the-record to true as documentedAllan Sandfeld Jensen2015-10-134-3/+83
| | | | | | | | | | The API had no way of setting off-the-record, because the constructor meant for it set it to false. The patch fixes the constructor and adds basic API tests for the QWebEngineProfiles. Change-Id: I407eb4a4b0524b6c4eb944d17d744620dd9db6fb Task-number: QTBUG-48724 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* make the render process DPI-awareJoerg Bornemann2015-10-133-0/+168
| | | | | | | | | | | | | On Windows, system calls that retrieve screen properties (like GetSystemMetrics to get the size of a scroll bar button) are dependent on the DPI awareness setting of the calling process. The render process must use the same DPI awareness setting as the browser process. Retrieve the DPI awareness of the parent process in the render process and set it accordingly. Task-number: QTBUG-48380 Change-Id: Ic17d29d0f584e3cf230ac6ea2b08e3aa0d87ccdd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add changes file.Joerg Bornemann2015-10-131-0/+46
| | | | | | | List the most relevant changes. Change-Id: Ia61bd528e443ede5bef75dd61e68adc3ae637bb1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* [Doc] Correct the name of WebEngineNewViewRequest::userInitiated QML property.Michael Brüning2015-10-121-1/+1
| | | | | | | | | It was named isUserInitiated, which is the name of the C++ method used internally, not the name of the QML property. Task-number: QTBUG-48699 Change-Id: I82d69e3c2e011f1cffadc106322709d2b22ef275 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* fix python version checkJoerg Bornemann2015-10-061-5/+12
| | | | | | | | | | | | | | The python code that is used to determine the version number did not work with python3. In python3 print is a real function and must be called as such. Use positional accessors to be compatible with python < 2.6. Also extend the error message for users that attempt the build with python3. Task-number: QTBUG-48507 Change-Id: I49e1fb77c2cc421ac1faed8d8143bf605fbde700 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Parse suggested filename from content-dispositionAllan Sandfeld Jensen2015-09-301-0/+4
| | | | | | | | | Chromium hasn't parsed content-disposition by the time we get the download item, so we need to call the parsing manually. Change-Id: I105d0c6904dd764b368cb774e377a6028c082513 Task-number: QTBUG-48206 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5.1' into 5.5Allan Sandfeld Jensen2015-09-241-0/+47
|\ | | | | | | Change-Id: I003fe50e0ed39ba3e551543b1a43eb3e884500dc
| * Add changes filev5.5.1Allan Sandfeld Jensen2015-09-231-0/+47
| | | | | | | | | | | | | | List the most relevant changes Change-Id: I8556f2081d6e88572f1a5ffa694d561d6986c3cb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix httpUserAgent setting after the view's initializationSzabolcs David2015-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | Set user agent override on all WebContents of the specific BrowserContext. Task-number: QTBUG-47976 Change-Id: I4fc6f8d79aff6f372ca48d82642b3eab60f933d1 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Link with -ObjC to have ObjC categories workingAllan Sandfeld Jensen2015-09-231-0/+3
| | | | | | | | | | | | | | | | If we don't link with ObjC, categories as used by Blink will not work and cause crashes at runtime when failing selectors. Change-Id: I81520cc46ed996377b86760232bc99e275e48ff3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix metaobject signature of QWebEngineDownloadItem::stateChangedJoerg Bornemann2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | We need to fully qualify enum parameters in signals/slots for the meta-object system. Otherwise the old QObject connection syntax will not work. Task-number: QTBUG-48309 Change-Id: I7a99d8a924ed3566c410c1c0ee7392e863fb2030 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | enable OS X 32 bit buildJoerg Bornemann2015-09-211-1/+1
|/ | | | | | Task-number: QTBUG-48228 Change-Id: Ic8ee640316b95b2e7e2de9115330821dfae0e905 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix assert on exitAllan Sandfeld Jensen2015-09-103-0/+8
| | | | | | | | | | Remove frame loading error-page when frame is deleted, and make sure WebContents is destroyed before the observer so the observer can observe the full live-span including deletions.. Task-number: QTBUG-47945 Change-Id: I56bec611b8bfbfc6f75a1bc2108efbc80a81729b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* do not generate qmake_extras.gypi in the source directoryJoerg Bornemann2015-09-094-5/+10
| | | | | | | | | | Among other things, we store the used compiler in there. This information belongs into the build directory. Otherwise switching toolchains becomes challenging. Task-number: QTBUG-43014 Change-Id: I9bec26a235f5251322792632d4667cc71210286d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update WebEngineView documentationKai Koehne2015-09-072-35/+98
| | | | | | | | | | | | | | The split suggested in the comment does not work: You have to keep the complete documentation for a QML type in one file, the documentation bits in qquickwebengineview.cpp were silently ignored so far. This change moves over the bits from .cpp , adds missing documentation for new elements and sanitizes the output of others. Task-number: QTBUG-47909 Change-Id: Ie1ebb5a9fe952c7a76c8fe1b67135614ca90ce7a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Break destruction cycle between DownloadItem and WebEngineProfileKai Koehne2015-09-044-7/+14
| | | | | | | | | | | | | | All QQWebEngineDownloadItem objects are destructed as child objects of QQWebEngineProfile. However, they try to 'call back' to the already half-destructed QQWebEngineProfile object to unregister themselves. Avoid this by tracking the lifetime of the QWebEngineProfile with a QPointer. Task-number: QTBUG-48088 Change-Id: Ie6a76440ad9f37d7cbc38b4ce35bf5da785d0e2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix includeJoerg Bornemann2015-09-031-1/+1
| | | | | | | | The global include must either be prefixed with private/ or locally included. Change-Id: I7933d940bdddae4975db8e58fe52a887adec51ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update Chromium for cherry-picked security fixesAllan Sandfeld Jensen2015-09-031-0/+0
| | | | | | | | Includes fixes for CVE-2015-1284, CVE-2015-1290 CVE-2015-1291, CVE-2015-1292 and CVE-2015-1294. Change-Id: I6c51978452ebcf079dab75804560c5d0eafa81b1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add tst_geopermission QML test caseAdam Kallai2015-09-013-0/+133
| | | | | Change-Id: Icfb74f3ef8b0745d3fc0a7335f8344960a74fa0b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: edit WebEngineProfile docsLeena Miettinen2015-08-281-55/+43
| | | | | Change-Id: Ifdfb36206c31215687f913e6887c8f9125487cf1 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update submodule for ICU fixAllan Sandfeld Jensen2015-08-281-0/+0
| | | | | | | Pulls in the ICU overflow fix. Change-Id: I898bd9701b1c2df4eb55b11ee82eb7bab494af89 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: edit QWebEngineDownloadItem docsLeena Miettinen2015-08-281-15/+16
| | | | | | | | Use same wording as for the QML type, where appropriate. Change-Id: Idb10f054f334056713bf902c68e567c70fe150f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: edit QWebEngineCertificateError docsLeena Miettinen2015-08-281-2/+3
| | | | | Change-Id: I147f7e3da41804f7b28e08647a0b6d1756394e4f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: edit WebEngineNewViewRequest docsLeena Miettinen2015-08-281-8/+7
| | | | | Change-Id: I6597ce1b1bbb8a59f7852ee79c199c5774fc65b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:47:23 +0000