summaryrefslogtreecommitdiffstats
path: root/src/webengine
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Link to Platform Notes from the OverviewLeena Miettinen2016-02-231-0/+4
| | | | | | Task-number: QTBUG-51138 Change-Id: I292b23d450f393fca2dd0a9b12d903309a6000bc Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Add "Namespaces" to the C++ API ref titleLeena Miettinen2016-02-183-3/+3
| | | | | | | | To make it easier to find the documentation for the QtWebEngine namespace. Change-Id: I61cd073f63f2064e256e20c8f675faa69d982cc0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Document Chromium version also in the documentation.Michael Bruning2016-02-181-0/+3
| | | | | | | | The changes files may not be available or obvious for all users. Change-Id: I470e8bf70ebacc34457788f595ca0fa22349e580 Task-number: QTBUG-48098 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* OS X: Fix crash when setting a custom default QSurfaceFormat.Alexandru Croitor2016-02-042-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a new default QSurfaceFormat after QtWebEngineCore::initialize() is called, might lead to a crash. This happens when the new surface format has a different OpenGL profile, compared to the profile created by web engine in the RenderWidgetHostViewQtDelegateWidget constructor. The default constructed QSurfaceFormat has an OpenGL Compatibility profile. Inside the Cocoa platform plugin when a new shared OpenGL context is created, it fails to initialize the new context because of the difference in profiles, and thus ultimately creates an unshared context, which leads to a crash. Fix consists in using the shared context QSurfaceFormat in the RenderWidgetHostViewQtDelegateWidget constructor, and also printing a fatal warning to notify the developer only to set the new QSurfaceFormat before the application instance is declared. Bottom line, if the QSurfaceFormat OpenGL profile has to be changed, it should be done before QtWebEngineCore::initialize() is called. Doing so after initialize() is called, will lead to a crash. Change-Id: I8a07211b592143d736b001556b944d4759802396 Task-number: QTBUG-50665 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* Mark highlighted examplesKai Koehne2016-02-041-0/+3
| | | | | | | | So far this has been done centrally in qtbase, but having the list in the modules actually makes maintaining them easier. Change-Id: I8bfab036cd86dea30e5b8ae8cf3993c458a20e9c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6.0" into ↵Jani Heikkinen2016-02-042-2/+68
|\ | | | | | | refs/staging/5.6.0
| * Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-012-2/+68
| |\ | | | | | | | | | Change-Id: Ic2e3312f316dbe042e2103d3f19fde639faa2707
| | * Doc: add documentation for the WebEngineScript itemLeena Miettinen2016-01-202-2/+68
| | | | | | | | | | | | | | | Change-Id: Ice1b0a403686b4a280b2709a79fe2ed18ace3ab6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-021-0/+16
|\ \ \ | | | | | | | | | | | | Change-Id: Ifca953bf6fa663b81dba77a4e825d3917c8e33fc
| * | | Doc: rendering to OpenGL SurfaceLeena Miettinen2016-01-281-0/+16
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-50037 Change-Id: I9c7a09824172a09d8b454bf8ff5d358c00ce6b88 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* / / Doc: add a dependency to qtwebview for linking to the moduleLeena Miettinen2016-02-011-0/+1
|/ / | | | | | | | | | | | | | | | | qtwebview should be listed as a value of the depends option in the qtwebengine.qdocconf file. It was probably removed by mistake. Change-Id: I86418673b5b8ef01696f8a73bbcf808877e51690 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Document OS X 10.9 dependencyKai Koehne2016-01-221-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-48779 Change-Id: Iaf189f69a9c4434a9417d482e63b83d8fc2f58b1 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Corrected reference to BrowserWindow.qmlNico Vertriest2016-01-221-1/+1
| | | | | | | | | | | | Change-Id: Ie6da4f94233a336c497074a5a9a83d27a86329ae Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Doc: warn about heavy routines blocking content renderingLeena Miettinen2016-01-201-0/+3
| | | | | | | | | | | | Task-number: QTBUG-50092 Change-Id: I1f3bbcab3b1999b9ecc86660ff9fef8330775cb4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Widgets: Improve geometryChangeRequested signalSzabolcs David2016-01-191-0/+1
| | | | | | | | | | | | | | | | | | Use this signal to notify the user on JavaScript window move/resize requests. It works only for windows opened by JavaScript (according to the Chromium browser's behavior). Change-Id: I7fdeda4c252cc4badb36b74ed61d947be690f45a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Do not return negative values in WebEngineHistoryListModelMichal Klocek2016-01-151-3/+7
| | | | | | | | | | | | | | | | | | QSortFilterProxyModel does not like negative values which were returned when adapter was not yet initialized. Add missing guards for adapter. Change-Id: I3d1dd5343aaf2c4d5504950005b05fb650835884 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Doc: Document support for proxiesKai Koehne2016-01-151-0/+9
| | | | | | | | | | Change-Id: Icde2ed5519fe27d7b69d89e1c734d466cf65dfe3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix initialization order of m_webChannelAllan Sandfeld Jensen2016-01-151-1/+1
| | | | | | | | | | | | | | | | The initialization order did not match the declaration order causing compiler warnings. Change-Id: I3c852525736a145202085a698b542a7df7c3a9d9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: Use WebEngine.settings.pluginsEnabled as exampleKai Koehne2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | javaScriptEnabled is true by default, so setting it explicitly to true is a bit dubious. Enabling pluginsEnabled (which is false by default) is a better example. Change-Id: I8a94d0fed895c6bc4211bd6718aaba34a437f8c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Show host only in authentication dialog to reduce window sizeJoni Poikelin2016-01-141-2/+3
| | | | | | | | | | Change-Id: I6742fb003420404dafdcf204b5c3e9ffd9f474fc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-112-0/+6
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
| | * Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-222-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Avoid creating contents adapter on webchannel accessAllan Sandfeld Jensen2016-01-092-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Postpones the setting of webchannels until the content adapter is created normally. This also simplifies maintaining it over changing adapters. Change-Id: I19b861acd3310a7d98c79059911f6ce8c042760b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Implicitly use QStringBuilder in all modulesJoerg Bornemann2016-01-093-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every Qt module is built with QT_USE_QSTRINGBUILDER by default. Also define QT_USE_QSTRINGBUILDER in the core API library. Remove superfluous qstringbuilder.h includes. Keep the use of operator% to make sure that QT_USE_QSTRINGBUILDER won't vanish in future build system changes. Change-Id: I41fd036fc4e6063951cd758aaafdf9aefed7dd5a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Avoid creating contents adapter when setting background colorAllan Sandfeld Jensen2016-01-081-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the initial setting of a non-default background color to initialization, so we don't need to force the creation of the contents adapter if a WebView component sets the background color. Change-Id: Iabd0146e6072653962877162d66da58154faf770 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | | Fix warning about unused d-pointerJoerg Bornemann2016-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | This amends commit 4f850494. Change-Id: I3004c38b03ab4a903cb987400c61e855b2cc584e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Ensure contents adapter for running javascriptAllan Sandfeld Jensen2016-01-071-2/+1
| | | | | | | | | | | | | | | | | | | | | It should be possible to run javascript on a view being initialized. Change-Id: Ia715bb6b897caa33308f7b042c3aa46aa1b45cd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Make lazy contentsAdapter initialization lazierAllan Sandfeld Jensen2016-01-072-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By postponing the creation of the contents adapter until the eventloop is started we can avoid creating it multiple times if the profile is changed during QML loading. This also works around a bug on startup of quicknanobrowser in single process mode, but doesn't solve the underlying problem. Change-Id: I8859fd91dd828658b363ebf89ca619a193deaefc Task-number: QTBUG-50256 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | UIDelegate: setParentItem for dialogsJochen Seemann2016-01-071-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | Set the visual parent of the dialogs like we already do in showFilePicker(). This is needed when overriding the standard Window-based dialogs with Item-based dialog, e.g. on platforms that only support one window. Change-Id: I99e9397211994d027afea6f7557acf3ebc4ac424 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: certificate management in Qt WebEngineLeena Miettinen2016-01-052-0/+12
| | | | | | | | | | | | Task-number: QTBUG-49987 Change-Id: I04440144566d7a0caf36f6eaf3b724a02cf58205 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: Audio and video codec supportLeena Miettinen2015-12-172-0/+27
| | | | | | | | | | | | Task-number: QTBUG-48741 Change-Id: I2676661ec389e6b5c0bd775302fcc3ee4a4bfde6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix fullscreen mode in qml apiMichal Klocek2015-12-173-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | Current implementation was not working correctly for quicknanobrowser when entering and leaving fullscreen video, in cases where the browser itself was already fullscreen. Use ExitFullScreen to leave fullscreen in demo code. Use onFullScreenRequested handler to track if fullscreen mode is on. Change-Id: I022d5e830b189897d34a9a8747381d041101c692 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: loading PPAPI pluginsLeena Miettinen2015-12-171-4/+24
| | | | | | | | | | | | Task-number: QTBUG-49625 Change-Id: I1729fb900e0a84971f81ea7bce384839279712f8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Expose UrlSchemeHandler API in QQuickWebEngineProfileKai Koehne2015-12-172-0/+95
| | | | | | | | | | | | Task-number: QTBUG-49914 Change-Id: Idfe596db1ec9fab3728f6dbfa55d5e6d7e5415ff Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix MouseReleaseEvent not being sent when clicking on a context item.Alexandru Croitor2015-12-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The context menu that appears, when right clicking in a WebEngineView, does not have a parent. On OSX if a context menu does not have a parent, a MouseReleaseEvent is not sent when an item is chosen in the menu, and thus consecutive mouse events are not handled properly. The fix consists in assiging the WebEngineView as the QML parent for the context menu that is opened. Task-number: QTBUG-44666 Change-Id: I7f79d4497c57a814866089195da1570591a6999e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add QQuickWebEngineProfile::setRequestInterceptorKai Koehne2015-12-152-2/+18
| | | | | | | | | | Change-Id: Icde3eb91ca61c5fcaa7cf5adc2171a34cc3c2452 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Move WebEngine initialization to core libraryAllan Sandfeld Jensen2015-12-151-47/+5
| | | | | | | | | | | | | | | | This means QtWebEngineWidgets no longer needs to depend on and link to the QML API. Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Make QQuickWebEngineProfile publicKai Koehne2015-12-1212-186/+340
| | | | | | | | | | | | | | | | | | Make QQuickWebEngineProfile a publicly exported class. This allows users to set up and manipulate the profile from C++, and removes the ugly hack needed to access the cookie store. Change-Id: I99e1a8c2cb99d9d1a14e1c78bec5948ba1282fb3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove explicit version \inqmlmoduleKai Koehne2015-12-109-11/+11
| | | | | | | | | | | | | | Also bump version in \qmlmodule QtWebEngine 1.2 Change-Id: I4d0379a3a46548e626508a8cf1fad51f742c8ddb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Make the MIME-type of downloads availableAllan Sandfeld Jensen2015-12-075-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An application currently have to rely on suggested filename only to guess the type of a download. This is often insufficient when the suffix is misleading or missing. This patch adds the mimetype to the reported metadata and also adds a mimetype appropriate suffix to suggested filenames. Task-number: QTBUG-48206 Change-Id: I4c70f076d6eb5ae820fd6b7f568515eeb7c18df5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Quick: Close WebUI popups properlySzabolcs David2015-12-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch deactivates the web view with a FocusOut event when it turns to invisible and Chromium closes its WebUI popups. In case when the window is closing, we can't always rely on the destroyed() signal or the visibility state of the WebEngineView, since we have multiple top level windows and the destroying order of the items is not so trivial as in the single-window case. Task-number: QTBUG-49099 Change-Id: I802a47c72eed3ed6352f1ba24998622fc95bb48a Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Doc: edit WebEngineCertificateError QML type docsLeena Miettinen2015-12-041-9/+11
| | | | | | | | | | Change-Id: I658eaaefa422a0393318140a345e5114a3c085e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rename QWebEngineCookieStoreClient to QWebEngineCookieStoreMichal Klocek2015-12-014-7/+7
| | | | | | | | | | Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-12-011-0/+18
|\ \
| * | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-271-0/+18
| |\| | | | | | | | | | Change-Id: Ie1f05c97650ecb86a6fe2d69ad037790c315a83b
| | * 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>
* | | Update QtWebEngine version in module overviewKai Koehne2015-12-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Also remove QtQuick import. This one is not specific for the module. Change-Id: I0cdbb0f36823e109e0b4b93e65ae3de59aebd2b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Doc: Adobe Flash player plugin supportLeena Miettinen2015-12-011-0/+30
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-49625 Change-Id: I2b01f45d0b8082a13eff4a4629de13fa8da862aa Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>