summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve thread safety and behavior of custom URL requestsAllan Sandfeld Jensen2015-05-063-8/+75
| | | | | | | | | Adds thread protection between the UI and IO threads access to the QIODevice, and changes it to a QPointer, so we can tell if the user deletes it. Change-Id: I3e7b3f682d4c5a145d75cd5822affcfc9012cff7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add documentation of Custom URL requestsAllan Sandfeld Jensen2015-05-062-0/+67
| | | | | | | | | | Adds basic documentation to the API. Though the API is still private we would like people to experiment with it, which is easy if it is documented. Change-Id: I63985dfc16dc91270d95edf6fc306f9c71a10f29 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
* Fix crash when updating a storage context with active requestsAllan Sandfeld Jensen2015-05-061-0/+12
| | | | | | | | | | Requests keep pointers to objects owneded by the storage context such as the SSL context handler and HTTP cache. This means we must stop all requests before destroying the context, otherwise the requests will access deleted data. Change-Id: I67863287b3ffb470c8d84ff6cac143493998a6da Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Prevent conflicting declaration errors of GL typedefsv5.5.0-beta1Andras Becsi2015-04-303-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including gpu/command_buffer headers in Qt code pollute by including ui/gl/gl_bindings.h which pulls in system GL headers. This will cause conflicting declaration of typedefs when included together with content/gpu and content/common/gpu headers which pull in gles2_cmd_format.h that forward declares some GL types. Although the gl_bindings.h header states in a comment that it should only be included in source files, the inline implementation of texture_manager.h and some other low-level GL integration headers nonetheless require gl_bindings.h, which unfortunately cascades through to our core layer and may cause problems when Qt code is compiled. Since getting rid of this include in Chromium's headers is not feasible due to maintenance costs, making sure that in Qt code gpu/command_buffer headers are included before content/gpu and content/common/gpu headers and guarding forward declarations in gpu/command_buffer/common/gles2_cmd_format.h should be a sufficient workaround. We can however get rid of the polluting includes in src/core/gl_surface_qt.cpp, which only requires forward declarations. This also includes a SHA1 update for the Chromium submodule. Task-number: QTBUG-44240 Change-Id: I5813a3663d36e2b565e4fd7f429add7b6f8f8a69 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Remove Q_UNREACHABLE from DesktopScreenQt::GetDisplayNearestWindowSzabolcs David2015-04-301-1/+2
| | | | | | | | Chromium uses this method when the user attempts to drag. Task-number: QTBUG-45723 Change-Id: Ibe3946846f0f4e2d2a25ca36e66fa7235d4aecea Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix prefix buildPeter Varga2015-04-292-4/+4
| | | | | | | | | | | Deploy resources, locales, icu and plugins into the build directory instead of install directory. It is necessary when Qt is configured with -developer-build and -prefix options: the compilation may fail if user has no write access for install directory. Task-number: QTBUG-45796 Change-Id: I425f26fcb4b611c255dd744cb9b4eafe16015d6f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Widgets: Use overridden show()Szabolcs David2015-04-272-4/+1
| | | | | | | | Notify client about the show() after RWHVQD creation. The WasShown(...) hack is not necessary anymore in the core layer. Change-Id: I221b2d027ee83d81d70191419bc4fa8d41231674 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Partially revert "Fix QtCreator loading of qtwebengine.pro"Andras Becsi2015-04-243-4/+4
| | | | | | | | Changing the python print signature seems to cause problems on Windows, so revert it. Change-Id: I715f792b880a2269ec153bbc73b432c6a4e87cc5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Cleanup some Blackberry legacy code.Pierre Rossi2015-04-231-38/+5
| | | | | | | The blackberry-specific location is dead code by now. Change-Id: I1321c0fb3ea5cd99e513c2fff11724aa92a19cdd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Remove unused includesPeter Varga2015-04-231-3/+0
| | | | | Change-Id: I87de823c9a67f4e30dd9a86b185bfde51b934509 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Force to use English language for QML auto testsPeter Varga2015-04-236-2/+30
| | | | | | | | | | Moreover, localization setting via QtWebEngine is fixed. System localization setting can be overridden by --lang command line argument. Task-number: QTBUG-45715 Change-Id: I39f3a891e55ee47a57afc394e849ea02b0c76ad5 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Update snapshot SHA1Peter Varga2015-04-231-0/+0
| | | | | | | | This update removes android files and contains localization fix. Task-number: QTBUG-45715 Change-Id: Iac08a5c18514c605265aad875b30f7cb5307b420 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* WebEngineView does not load a url while invisibleAndras Becsi2015-04-226-1/+22
| | | | | | | | | | Notify the RenderWidgetHost about visibility changes so that we receive updates with non-empty DelegatedFrameData when a page was loaded in an invisible WebEngineView and then made visible. Task-number: QTBUG-42789 Change-Id: I4856efcd9c0ce44b66a228d5a414198df46b95eb Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix assignment of observer to RenderProcessHost.Adam Kallai2015-04-213-3/+6
| | | | | | | | | By default Chromium uses the process-per-site-instance process model. Therefore if there is a renderProcessHost which is already observed we do not need to add another observer for user scripts. Change-Id: Ic0c2104ebbefb2b8427c43c4c665d96b5a991ba1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Remove erroneous semicolons after Q_DECLARE_* macrosAndras Becsi2015-04-205-7/+7
| | | | | | | | Some of these declarations had habitual semicolons at the end, which would fail when compiling with -Werror,-Wextra-semi. Change-Id: I8dd73462fc1c10b0bb746fbfc3281d9cce36e5fc Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix the crash on exit with --single-processSzabolcs David2015-04-201-0/+2
| | | | | | | | In single process mode, RenderProcessObserverHelper got destroyed before its host. Change-Id: Ic2f36de3218f5ad6781610dbf677675b7e41a9eb Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Add a fallback for QLibraryInfo::DataPath as well.Michael Brüning2015-04-161-7/+25
| | | | | | | | | | | | This should remove the necessity to have a qt.conf file for deployed Windows applications. Also, be consistent about three dots in the messages that get printed when trying fallback directories. Task-number: QTBUG-45614 Change-Id: If46c93a0e8f150b91cff188517187a58edff9144 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Quick: Document fullscreen APISzabolcs David2015-04-161-0/+92
| | | | | Change-Id: Iade66eaea7016e6f7d73f25f8fc7af1879d099d9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Liang Qi2015-04-164-4/+10
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Andras Becsi2015-04-154-4/+10
| |\ | | | | | | | | | Change-Id: I1e414bb2252ee4b2204ef50a9d122d1d1504115d
| | * Update submodule SHA1Michael Brüning2015-03-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This includes the fix for the SIGPIPE handling. Task-number: QTBUG-44689 Change-Id: If418da89620c6ec87240d0264901dd23c1881310 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Update links from qt-project.org to qt.ioSergio Ahumada2015-03-061-3/+3
| | | | | | | | | | | | | | | Change-Id: I0882a82457eaef37e84f81ad3bc44e1d65cec4ef Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | * Update chromium SHAAllan Sandfeld Jensen2015-03-061-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib9812da6bf5fc504fe5997ea9fd62ccae960d132 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Fix non-accessible build without -fpermissiveStephan Binner2015-03-051-2/+0
| | | | | | | | | | | | | | | Change-Id: I0279f26374070614cf8df0e6601b17e5b01b3be6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Enable building Qt WebEngine without accessiblity enabled.Stephan Binner2015-03-0418-5/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds guards that for QT_NO_ACCESSIBILITY being not defined around the code that uses accessibility types. It disables the quicknanobrowser and quicktestbrowser examples which need Qt QuickControls, which has a hard dependency to accessibility being enabled. Backport of d95b9295c970401939d2779cbdc9e2a8c7965277 from 5.5 Change-Id: I2a2a0a6196fcb3baa39603d9c929183b454f39ed Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Fix compiler detection and let Qt decide if examples should be builtAndras Becsi2015-03-042-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the build on OS X if the path to clang is not cached, and only builds examples if Qt was configured to do so. This has already been fixed in dev. Change-Id: Ia2d17f38f30e832425f6e1cd014b46a6c6ae78ec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Fix QUICK_TEST_SOURCE_DIR macro on WindowsPeter Varga2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Backslashes in the path were interpreted as escape characters on Windows. Change-Id: Ifdb81efb51ec09d822aa243514fe145c700faaf7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Deploy QtWebEngineProcess.exe at library executables path on WindowsPeter Varga2015-04-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the proper library executables path on Windows instead of the libexec. With this fix it is not necessary to set QTWEBENGINEPROCESS_PATH environment variable per default. Change-Id: I8cce07b8adbccc88b03c9cf942841eb1d4a5f176 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Fix compile warnings of QWebEnginePage widget auto testPeter Varga2015-04-151-0/+5
| | | | | | | | | | | | | | | | | | | | | Change-Id: I22a63075c66d263e4aebb6aea47e80d6ce08cb3c Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | | Fix QtCreator loading of qtwebengine.proAndras Becsi2015-04-155-4/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix QQuickWebEngineDownloadItem member initializatonAdam Kallai2015-04-142-0/+3
| | | | | | | | | | | | | | The totalBytes member has to be set before the downloadRequest would be emitted. Change-Id: Ifc164fb2d7f3318b825e28edb5b200ab623740d5 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Remove eAndroid hooksAndras Becsi2015-04-1416-173/+13
| | | | | | | | | | | | | | | | Support for the B2Qt/eAndroid platform is discontinued with Qt 5.5 so we can remove all remnants of the android platform. Change-Id: I93f15fcd4a345203e15010ddf1e8de3e8d28ab56 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update expected list of public API testAdam Kallai2015-04-141-6/+44
| | | | | | | | | | Change-Id: Ifccac63f95d3147b46486eb7a09fbad9e3f52f67 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add tst_userScripts QML testSzabolcs David2015-04-095-0/+286
| | | | | | | | | | Change-Id: Id023c3f6e4be05c44314418511062015413d76c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Remove tst_setUrlWithFragment test caseSzabolcs David2015-04-091-41/+0
| | | | | | | | | | | | | | | | | | This test is flaky, we don't have proper signals for in-page navigations and this case tests the behavior of the browser engine, not the QtWebEngine API. Change-Id: Ia94219df3501126bf1ab00a400a57d589b651589 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add a fallback for discovering plugins and translations.Michael Brüning2015-04-091-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix problems with deployed applications and remove the need to use a qt.conf file to configure the PluginsPath and TranslationsPath in order to get for example ffmpegsumo loaded by default. It should also fix the creation of empty directories from the Chromium layer. Task-number: QTBUG-44331 Change-Id: I08bb5ac1b308820bed2c758b30ce43f1209038e1 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Update snapshot SHA1Peter Varga2015-04-081-0/+0
| | | | | | | | | | | | | | Various path fixes for shadow building on Windows. Change-Id: Ida98f3d5a993dfda4e13f211318c25f4567cd145 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Revert "Enable the use of IPC tracing"Peter Varga2015-04-071-6/+0
| | | | | | | | | | | | | | | | | | This reverts commit 3ef408a32c352d86fbc1346304e0a6ffbbe12c0b. Change causes assertions in debug when browser exits. Change-Id: I5e4a57d4e444ad2974c7fe44c4928c486337a04a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix openWindowDefaultSize QWebEnginePage testPierre Rossi2015-04-071-7/+8
| | | | | | | | | | | | | | | | | | Add some qWait statements for timing-sensitive popup test. Replace QVERIFY with QCOMPARE for better reporting when it fails. Change-Id: I75eb2e774851beb01376042f0b60614db005970c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Fix tst_keyboardModifierMapping QML testSzabolcs David2015-04-072-1/+10
| | | | | | | | | | | | | | It needs some waiting time after keyboard events. Change-Id: I970f15b66bea3399b8dff43a9323c2827ad19823 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Revive ReloadAndBypassCachePierre Rossi2015-04-075-0/+20
| | | | | | | | | | | | | | | | | | Appears to be an oversight for widgets, as the API was there, but just wasn't wired. Also add it for QQuickWebEngineView while we're at it. Change-Id: I07d6e356cbaf22b79f3fc5a82df78c6821993e8d Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | Enable build of QWebEngineScript API testSzabolcs David2015-04-072-24/+25
| | | | | | | | | | | | | | The MSVC doesn't support this type of string literal concatenation. Change-Id: I051593a34c801df6c5264370ad751c45bbb41b5a Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Improve documentation about certificate errorsPaulo Pinheiro2015-04-073-4/+58
| | | | | | | | | | | | | | | | | | | | Documentation about how to handle certificate errors was poor, so this patch try to improve that. [ChangeLog][QtWebEngineQML][QQuickWebEngineCertificateError] New API for handling certificate errors in the QML API. Change-Id: I9234f5c8296651e7634ee41827fc6dcce503398b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix publicapi test failuresPierre Rossi2015-04-071-0/+6
| | | | | | | | | | | | | | The API still needs to be updated to take out the EXPECT_FAIL Change-Id: Ib10019bccb1d05e61ddeaf91e645f4899284487f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | QQuickWebEngineScript: First stab at documenting sourceUrl and sourceCode.Robin Burchell2015-03-291-0/+21
| | | | | | | | | | Change-Id: I9674488a95e3d0293c52b854201bb840392a641f Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Quick: Document javaScriptConsoleMessageSzabolcs David2015-03-242-1/+12
| | | | | | | | | | Change-Id: Iaf5a9c7915cdce36fe3219dd686059973d1a6251 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix gesture recognitionAndras Becsi2015-03-201-0/+2
| | | | | | | | | | | | | | | | | | Disable new gestures swipe and two-finger tap which seem to interfere with scroll and single finger tap in our current gesture provider code. Change-Id: Ib6d3590cafcc8bbd6ff2399d94a1ee9334070a5a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix license headers for qml tests.Pierre Rossi2015-03-2023-23/+23
| | | | | | | | | | | | | | Wrong module... Change-Id: Ie9657084e19b33798eef609385ee864340806007 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Introduce mock UIDelegates for testing.Pierre Rossi2015-03-2017-154/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | Switch JS dialogs test to using this over the testsupport plugin. This is a less intrusive approach that lives as self contained qml modules within the test infrastructure. As an added benefit, it covers the UI delegation logic from end to end, including what happens in ui_delegates_manager.cpp. Change-Id: I1cc0afaf5514d53e1f3b4b0682379dd2d8d8a913 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Demo browser: re-add user stylesheetsPierre Rossi2015-03-205-24/+63
| | | | | | | | | | | | | | | | | | | | | | Implemented in terms of user scripts. Considering loading from a file URL would probably require setting a different cross origin policy for the isolated world we run this in, something we don't quite have yet, it seems easier to just use an inline <style> block. Change-Id: Ia6f7fbb96b925bcc3202b510689524abd93643fc Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>