summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QQuickWebEngineView: add activeFocusOnPress propertyPierre Rossi2015-06-037-9/+50
| | | | | | | | | | This allows to use a WebEngineView to make a UI element that should not get focus, which can be useful inthe case of hybrid UIs. [ChangeLog][QtWebEngineQML][QQuickWebEngineView] Add activeFocusOnPress Change-Id: I0666f81badd135db0049e0dd7b0fc30d0765b1c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix inconsistent dll linkage warningsAndras Becsi2015-06-031-1/+1
| | | | | | | | Use the correct export macro in qwebenginescriptcollection.h else we'll end up with inconsistent dll linkage issues with msvc. Change-Id: Ie38bc9fd7ec120b68ef65e6b661536a942aea9f6 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Support QNetworkProxy::applicationProxyPierre Rossi2015-05-294-2/+263
| | | | | | | | | Implement a ProxyConfigService that keeps track of the state of Qt's application proxy which, if set, takes precedence over the system settings. Change-Id: I7f1eba9015b70cf90f53a41736dd0a6d0ad28489 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Make QQuick contextmenu actions behave like widget counterpartsAllan Sandfeld Jensen2015-05-274-4/+42
| | | | | | | | | Updates a two of the context menu actions so they behave like the updated actions in qtwebenginewidgets. Also improves the default label of OpenInThisWindow, since by default there are no other windows. Change-Id: Iac0dc23e8f31598296cba87f93503cefd926983f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devAllan Sandfeld Jensen2015-05-1816-34/+142
|\
| * Merge remote-tracking branch 'origin/5.5' into devPierre Rossi2015-05-1516-34/+142
| |\ | | | | | | | | | Change-Id: I1fbcd05760cb287d1d8a0fba344ec7cfe8348c7d
| | * Add redirect and error API for custom URLAllan Sandfeld Jensen2015-05-136-2/+126
| | | | | | | | | | | | | | | | | | | | | Adds API for failing or redirecting custom URL requests. Change-Id: Ia633bff2c0b8484fd6fdb8d42982fda2e427db4c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| | * Update embedded configurationAndras Becsi2015-05-121-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some obsolete options and add conditionals similar to desktop_linux.pri. Change-Id: Id295345028e5fd5f593cbd0b5dc6acdb5c00518b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Fix Menu ui delegate after on__MenuClosed has been renamedAndras Becsi2015-05-126-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal on__MenuClosed signal has been renamed to onAboutToHide in qtquickcontrols. Also update some import versions while we're at it. This patch also adds examples OSX application bundles to .gitignore which only contained the unix binaries. Change-Id: If1d91cb65987dda6d0e10794c1649b1b4e1ccde3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Remove unneeded ResourceContextQt::set_url_request_context_getterAndras Becsi2015-05-123-16/+3
| | | | | | | | | | | | | | | | | | | | | This is an ancient relic that can be removed. Change-Id: Ia6926fff65d0e4d0769de940516866a2c51d9a0c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Honor the AcceptsInputMethod flag on the WebViewPierre Rossi2015-05-152-4/+6
|/ / | | | | | | | | | | | | This can come in handy to make an HTML based input method keyboard Change-Id: Ieaf49a676262f40b0f250dc67e2f1cd0eeb08d82 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devAllan Sandfeld Jensen2015-05-1217-63/+180
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into devAndras Becsi2015-05-1117-63/+180
| |\| | | | | | | | | | Change-Id: I122ca8d3438333c6b41f751c47b1ce1f9a7066b9
| | * Quick: Share profiles between application windowsSzabolcs David2015-05-072-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The applications should not create new WebEngineProfiles for each window, because the WebEngineView can not adopt content from a different profile when the target of the NewViewRequest is a new window (SHIFT+click) or a dialog. This also adds a notifier signal to the profile property in order to avoid "non-NOTIFYable" warnings. Change-Id: I235789f9bfa1a216f99592204e50266242d0ef1c Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * 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>
| | * 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>
* | | Extend context menu actionsAllan Sandfeld Jensen2015-05-119-24/+292
|/ / | | | | | | | | | | | | | | Implements the several missing context menu actions for navigation and image and media handling. Change-Id: Ib8ea8311ea291fe2f98e509bc6f4034a5e0389c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Add tst_filePicker.qml test for UIDelegateAdam Kallai2015-04-241-2/+9
| | | | | | | | | | | | | | | | Testing single, multiple file and directory upload. Change-Id: I9da9e1f780a7f97a300fcaa38738ea781b85a4a7 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devAndras Becsi2015-04-2320-16/+64
|\| | | | | | | Change-Id: I6f913ebc7aed68d4b8c3f8666fd2389607b491b7
| * 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-235-2/+27
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-1921-180/+177
|\| | | | | | | Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
| * 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-163-1/+7
| |\
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Andras Becsi2015-04-153-1/+7
| | |\ | | | | | | | | | | | | 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 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-0416-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | 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 QtCreator loading of qtwebengine.proAndras Becsi2015-04-152-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1412-168/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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 support for Shockwave Flash plugin.Paulo Pinheiro2015-04-1616-3/+1167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary support to make Flash plugin work properly and be able to navigate on urls and load fonts from system. Support for fullscreen mode still missing. Change-Id: Id948cde47b852332e1a4f5a73e781f01d27223f8 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | | Fix initialization order in file_picker_controller.cppAndras Becsi2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I315c3476c943e81a43b21892c30f0550961194a1 Reviewed-by: Adam Kallai <kadam@inf.u-szeged.hu> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-0811-11/+111
|\| | | | | | | | | | | Change-Id: I7b0dae978357c6f48826ad8e09a8cb8477d1901d
| * | 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>