summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for 5.6.1Allan Sandfeld Jensen2016-05-131-0/+65
| | | | | | Change-Id: Ic36c55b5deaceb2a7944f33aead62c6cb31a01f9 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge 5.6 into 5.6.1Oswald Buddenhagen2016-05-122-1/+6
|\ | | | | | | Change-Id: I96aa7487c341f40c74832f00bc72995d25969329
| * add missing example installOswald Buddenhagen2016-05-102-1/+6
| | | | | | | | | | Change-Id: Ifee9bb458de2c15760da21938b5e5bb598936161 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | [Simplebrowser] Fix command line option parsing.Alexandru Croitor2016-05-111-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in using the last command line argument as the loading url only if it can be parsed as valid url. Change-Id: I3615ef57b6eddc5098de79cba1b1ba6b6af193ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update chromium submodule.Michael Bruning2016-05-101-0/+0
| | | | | | | | | | | | | | | | Includes the new fix for allowing qrc access to local files. Task-number: QTBUG-52085 Change-Id: Ifae5af52580a41f7d66429324714428694a6b65a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Revert marking qrc: as a local schemeMichael Bruning2016-05-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was causing a regression that broke applications that embedded JavaScript in qrc files and accessed them from other embedded JavaScript files. This is e.g. a typical pattern for applications that used QtWebChannel. This partially reverts 29f9a2fb68568208a70ba9efef0e455b50a4d3e3 Task-number: QTBUG-53108 Change-Id: I8b26395d84258b6d9aca8e0c5f07d4435617f44d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Blacklist flaky QWebEnginePage::setHtmlWithImageResource test.Alexandru Croitor2016-05-101-0/+3
|/ | | | | | | | | It used to be an expected fail, then it seemed to work in 5.6, and for some reason it fails again in 5.6.1. Change-Id: I95161e001c3b8af3ea48fc284e448a2d8853e108 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Doc: Add build requirements on supported platformsLeena Miettinen2016-05-061-4/+56
| | | | | | Task-number: QTBUG-52733 Change-Id: Id0806db78fd7a87cc78c6b284c2249a7ad203b7b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Quick fix for not working history in demobrowserMichal Klocek2016-05-044-50/+72
| | | | | | | | | | | | | | | | | | | | | | | Current implementation of history manager seems to be not straight forward. To display history we use QList to keep history items plus model adapter in form of HistoryModel (QAbstractTableModel) plus HistoryFilterModel to avoid duplication, plus HistoryTreeModel to make a tree view with split for dates, plus TreeProxyModel on top to enable sorting. This approach unfortunately falls apart when items should be deleted from the model by treeView. This ends badly with corrupted cached values. This fix removes history items using history manager. It also abandons HistoryTreeModel since frequent sourceReset calls make it unusable. If split for dates it desired the better approach would be to implement history tree model already at HistoryManager level to avoid unmaintainable code. Task-number: QTBUG-49913 Task-number: QTBUG-50255 Change-Id: Ic9cebb52b623bd453119e11b5e907eaa90609e34 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix memory leak of standardContextMenuMichal Klocek2016-05-041-0/+1
| | | | | | | Add deleteLater after menu is hidden. Change-Id: I7bf7f5e83b40328e220a1ff91f07055c160b6ab9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-05-041-0/+0
| | | | | | | Pulls in security patches from Chromium 50.0.2661.94 Change-Id: Idd71e08fe60d79074fca956d47522d708c5c2640 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* [Demobrowser] Fix command line option parsing.Alexandru Croitor2016-05-042-9/+21
| | | | | | | | | | | | | | | Passing just command line options to Chromium prevents loading of the initial startup url. This happens because the startup url is overridden by the last command line argument, which happens to be a Chromium option, thus an invalid URL. Fix consists in iterating through the command line arguments, until a non-option argument is found (doesn't start with a dash), and use that as the startup URL. Change-Id: Ibe2946b25b2e023c094a85e50d2ccbd5bfce2977 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix threading issues with URLRequestContextAllan Sandfeld Jensen2016-05-034-53/+162
| | | | | | | | | | | | | | | URLRequestContextGetterQt contains data which is shared between UI and IO thread. Make the class more thread friendly by making copies of the data that can be accessed from the IO thread, and protect synchronization with a full mutex instead of atomics. Also fixes circular reference between URLRequestContextGetterQt and BrowserContextAdapter. Task-number: QTBUG-50160 Task-number: QTBUG-52509 Change-Id: Idaba211533cfad229e1d1872cdfdf4e7dffeb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Reset the selected text of a page when setHtml is called.Alexandru Croitor2016-05-031-0/+1
| | | | | | | | | | | | | | | When text is selected inside a QWebEngineView, the selection is stored in a RenderWidgetHostViewBase instance. When QWebEngineView::setHtml is called, the stored selection is not cleared, and thus requesting for the selected text will return stale data that is not present in the page anymore. Fix consists in calling WebContentsImpl::Unselect() after the new html is loaded and focused in WebContentsAdapter::setContent(). Change-Id: Idd0f3187f324863b9a805af6a288dccfcbd5566f Task-number: QTBUG-53033 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix QtWebEngineCore::initialize() for Qt < 5.6.1Joerg Bornemann2016-05-021-0/+2
| | | | | | | | | | | | | | | In Qt versions < 5.6.1 the constructor of QCoreApplication directly calls QCoreApplication::init and QtWebEngineCore::initialize() in turn. That means that qobject_cast<QGuiApplication*> cannot work, because the object is not fully constructed yet. This was fixed for Qt 5.6.1 in commit qtbase/1b441c39. This patch turns off the fix for QTBUG-51789 when building QtWebEngine against Qt versions older than 5.6.1. Task-number: QTBUG-51789 Change-Id: I092fb559ea4449bd443737d5962b4b87dee88cdd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update chromiumJoerg Bornemann2016-04-281-0/+0
| | | | | | | | Pulls in fix for race condition in URLRequestRedirectJob. Task-number: QTBUG-52200 Change-Id: I43b822c87501e28ff3cd4a71513ec79712b726c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Never call QtWebEngine::initialize from DllMainCorentin Jabot2016-04-282-6/+16
| | | | | | | | | | | | | | | | | On windows, calling QtWebEngine::initialize from DllMain may crash, depending on what QPA backend is used. We make sure to only add a qAddPreRoutine initializing QtWebEngine if there is no instance of QCoreApplication. By doing so, we support linking to QtWebEngineWidget from a plugin, while still initializing the WebEngine automatically when linked to the main application binary. Task-number: QTBUG-46720 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> (cherry picked from commit 6a8d99ab00ace2084820547572dc05ac8ad2bc5a) Change-Id: Id3b2c1e21e01808cef124f8ece6b247b1ba613cb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Avoid default casesAllan Sandfeld Jensen2016-04-281-9/+10
| | | | | | | | | Prefer to list all enums to handling defaults, this makes it easier to catch missing cases in the future. Change-Id: Idae2f445bd907f62202a6b68da0d030e21863afe Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix hint to use WEBENGINE_CONFIG+=Kai Koehne2016-04-282-4/+4
| | | | | | | At least on Windows/cmd.exe you can't put spaces in the argument. Change-Id: I55767a23409403b695e225339f86daae2dea1dc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix unexpected passes in tst_QWebEnginePage::setHtmlWithImageResource.Alexandru Croitor2016-04-271-2/+0
| | | | | | | | | | Requesting a local file resource without a baseUrl set, should not be allowed. This hasn't worked before in Webkit, so the checks were marked with QEXPECT_FAIL. Remove these, as the issue has been fixed, and now causes unexpected passes. Change-Id: I7d38692a9961651d48abe28218d7ee022a85f101 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add missing icon and text for ReloadAndBypassCacheAllan Sandfeld Jensen2016-04-271-0/+4
| | | | | | | We were not handling this enum value. Change-Id: Ib44b9e42c8b9589513091d2f47c79623416ec358 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update ChromiumKai Koehne2016-04-251-0/+0
| | | | | | | | | 619d606 Fix Linux kernel lacking V4L2_CID_POWER_LINE_FREQUENCY_AUTO 91e1486 Fix Linux kernel lacking v4l2 multi-planar support Task-number: QTBUG-48298 Change-Id: I3fac1dcb04ecc17cdafccbe9add30d446641c83e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix regenerating job-factoryAllan Sandfeld Jensen2016-04-222-6/+34
| | | | | | | | | | | Only update installed custom url scheme handlers, and leave the rest of the job factory untouched, so we don't delete the protocol handlers and request interceptors Chromium passed us, and that are now owned by the job-factory. Change-Id: I640527487dda053463f8fa9986ceb47941593f2b Task-number: QTBUG-52790 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Cleanup and comment URLRequestContextGetterQtAllan Sandfeld Jensen2016-04-212-11/+17
| | | | | | | | | | | Add comments to parts of URLRequestContextGetterQt that are subtle and I already forgot once. Also adds another update atomic to match the rest. Change-Id: I8193247ce76435ac0d169b740a4543099b3ffac2 Task-number: QTBUG-52790 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Do not access browser-context to read user-agent or accept languageAllan Sandfeld Jensen2016-04-213-21/+44
| | | | | | | | | | | | Switches HttpUserAgentSettingsQt to reading local string that lives on the IO thread, instead of accessing a pointer that may be deleted. Also adds a test and fixes updating accept-language of already initialized WebContents. Change-Id: Iff4e3bd1ac40482a92bed50c3f703ed8b974b0ad Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Fix saving cookiesMichal Klocek2016-04-211-0/+1
| | | | | | | | | | Release CookieStore in URLRequestContextGetterQt destructor, this will eventually delete CookieMonsterDelegateQt and trigger commit of cookies in cookie store backend. Task-bumber: QTBUG-52121 Change-Id: Ic83c7ee3ece1c64ac9e47cba5dcf40e084d9c3dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix contextMenu handling in examplesMichal Klocek2016-04-212-5/+8
| | | | | | | | Adds missing deleteLater on close Change-Id: Id337856f138e0d38f0c72d3962ccac309d36c73e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Improve WebEngineHistoryListModel documentationKai Koehne2016-04-211-6/+3
| | | | | | | Change-Id: Ica5adc508113678747c20a9807ad09eaae79ccb1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* demobrowser: Remove unused loadingUrlJoerg Bornemann2016-04-212-18/+0
| | | | | | | | | Remove the unused m_loadingUrl member. Remove the loadingUrl signal that was forwarded to urlChanged. QWebEngineView already emits urlChanged. There's no need to do this twice. Change-Id: Ib9734c5b1571745f7b82b4e5f2bc92c7f1d8f51c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* demobrowser: Fix HistoryManager::clearJoerg Bornemann2016-04-211-1/+1
| | | | | | | | Clear the model before saving. Otherwise the cleared history will appear again after restarting the demobrowser. Change-Id: I79f939c1f1e8ee993127d139cefe7f5818ce593c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix crash when instantiating a QCoreApplicationJoerg Bornemann2016-04-211-1/+5
| | | | | | | | | | | | When linking against QtWebEngineWidgets, a Q_COREAPP_STARTUP_FUNCTION is installed, which is then called from QCoreApplication::init. In that function, check whether qApp is a QGuiApplication or derivative before calling QtWebEngineCore::initialize. Change-Id: I16a3cdda2c707040ad3707a83a192fcb9059ddc4 Task-number: QTBUG-51789 Task-number: QTBUG-52539 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* Fix copying images to clipboardJoerg Bornemann2016-04-214-2/+120
| | | | | | | | | | | | The SkBitmap to QImage conversion in ClipboardQt::WriteBitmap was hardcoding the image format to ARGB32. This failed whenever the format of the SkBitmap provided by Chromium was different. This change backports 1cf9175e from 5.7. Task-number: QTBUG-52715 Change-Id: Icf27b97bc421a2201c307a4514928dcf384d9ba6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Use the temporary zoom factor to set the zoom factorMichael Bruning2016-04-215-2/+70
| | | | | | | | | | | | | It turns out that using the temporary zoom factor is meant to set the zoom factor for one certain view, and this is actually what we want. Also added auto tests for this. Task-number: QTBUG-51851 Task-number: QTBUG-51969 Change-Id: I8912cbc25637d3c1681026380a2ab3068a964868 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Add tst_settings.qml QML test caseAdam Kallai2016-04-203-0/+131
| | | | | | | | | - Add test for localStorageEnabled setting. - Add test for javascriptEnabled setting. Change-Id: I7a67c24bdf76409148e88500d9a7a092f7896493 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove direct access BrowserContextAdapter's customUrlSchemeHandlersAllan Sandfeld Jensen2016-04-204-11/+11
| | | | | | | | Remove the non-const reference access to customUrlSchemeHandlers, and replace the last remaining use-case with clearCustomUrlSchemeHandlers. Change-Id: If9077e3900593d7f9520fb9bbcef2f1aa3307eac Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Improve thread-safety of custom scheme handlersAllan Sandfeld Jensen2016-04-208-22/+51
| | | | | | | | | Avoids accessing the QWebEngineUrlSchemeHandler from any other thread than the UI thread, since it may be deleted at any time on the UI thread. Change-Id: Icb4331b3c36f6f619a9fd975d155a9fd608dc5e9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* demobrowser: Fix precision of progress bar renderingJoerg Bornemann2016-04-201-1/+1
| | | | | | | The progress bar never reached the 100% mark. Change-Id: Id87bdb27f882d0d77ed0ad590e2c2278ce6fba92 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove unused BrowserContextAdapter handlesKai Koehne2016-04-205-11/+7
| | | | | Change-Id: Ic3504db1b55e1ff4375efacb450a96ce32a119ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix user-agent override works when setting contentAllan Sandfeld Jensen2016-04-192-0/+30
| | | | | | | | Adds test for user-agent override and fixes the override so that it also works when loading with content instead of URLs. Change-Id: I3f61b1d91b7b0908e35216722054168d1c514a87 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Switch BrowserContextAdapter to QSharedPointerAllan Sandfeld Jensen2016-04-1917-36/+39
| | | | | | | | | | | | BrowserContextAdapter is not a form of shared data, and using QExplicitSharedDataPointer on it as always been a misuse of the class. Instead we should switch it to QSharedPointer, which also allows us to use QWeakPointer. Change-Id: I8eb489b4a12d3fdddcde55821be294814a156a9d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Doc: Fix typo on WebEngineHistoryListModel documentationKai Koehne2016-04-191-1/+1
| | | | | Change-Id: If20959319ab8fb1ff7281bba6a1dfcfaabcc1989 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Assert thread assumptionsAllan Sandfeld Jensen2016-04-191-0/+10
| | | | | | | Assert and thereby also document thread assumptions. Change-Id: I44cd8b015ed8a6e38b9328f334f55d9d2f72b50d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-04-181-0/+0
| | | | | | | Pulls in update that makes remote inspector compatible with Chrome 50+ Change-Id: I5e5db318228fa77c650f058fc834568c1d5bb6ad Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Install all resources for developer build in .pro fileKai Koehne2016-04-152-26/+8
| | | | | | | | | | ICU .dat file and .pak files were already copied to the developer build directory in core_module.pro. Let's do the same for translations, and remove the logic handling this in resources.gyp. Change-Id: I4926cd6012f2664feed27aa042eb3ceb282a93d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* SimpleBrowser: Fix loading iconKai Koehne2016-04-151-1/+1
| | | | | Change-Id: I008b649b43069978b6ce19b2faf5a557dd67c756 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Update ChromiumAllan Sandfeld Jensen2016-04-151-0/+0
| | | | | | | Pulls in security fixes from Chromium 50 Change-Id: I46f331fd37b17366231469c1b5aa2df9bea75291 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Demobrowser: Fix black screen after exiting fullscreen mode on OS X.Alexandru Croitor2016-04-151-3/+6
| | | | | | | | | | | | | | | | | | | | When exiting fullscreen while viewing a full screen video, the video is replaced with a black screen, and does not switch back to the initial page. This happens when hide() is called on a native window while being in fullscreen, which hides the window, but does not exit full screen mode, thus showing a black screen. The workaround fix consists of two parts: 1) Make sure to delete the fullscreen window object, to release the OS virtual screen it occupies (visible in mission control as a black rectangle). 2) Hide and show the main page window, to force exit fullscreen mode. Change-Id: I364d4427e84957ed97f57a14e2cfc2c95aed6f48 Task-number: QTBUG-52058 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix crash while settingPersistentStoragePathMichal Klocek2016-04-131-1/+4
| | | | | | | | | | Get rid of dangling pointer on storage removal in URLRequestContextGetterQt. This is accessed later in generateHttpCache. Task-number: QTBUG-52468 Change-Id: I03c0b3186b01046e17258af838bf5f9adc435da0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix compilation error with missing includeKai Koehne2016-04-111-0/+2
| | | | | | | | | I could not reproduce the issue, nor the CI. Anyhow, it doesn't hurt to include the header explicitly, instead of relying on indirect includes. Task-number: QTBUG-52460 Change-Id: I78d04f3af853aa5951cdfc066089f06f71f72988 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Mark WebEngineSettings::defaultTextEncoding as new in 1.2Kai Koehne2016-04-111-0/+1
| | | | | Change-Id: Iee69fd2b033cfe09d5347e8502812632d1309b19 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 03:00:18 +0000