summaryrefslogtreecommitdiffstats
path: root/src/webengine/api
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix typo on WebEngineHistoryListModel documentationKai Koehne2016-04-191-1/+1
| | | | | Change-Id: If20959319ab8fb1ff7281bba6a1dfcfaabcc1989 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* 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>
* Revision DownloadItem.mimeTypeKai Koehne2016-04-051-0/+1
| | | | | | | | The property was already revisioned, but the signal was not. Also mark the property as new in the documentation. Change-Id: Iab50bea0d593e9dafb3e58b7f99dd5b95655a1a9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: WebEngine does not support Chromium extensionsLeena Miettinen2016-04-051-0/+2
| | | | | | | For example, @include, @match, and @exclude. Change-Id: I16d29b4e72452980e43c8e7c5702e21cccf159d5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add missing revision tag to the mimeTypeChanged signalAdam Kallai2016-04-051-1/+1
| | | | | | | | The mimeType property of the WebEngingeDownloadIten is tagged for REVISION 1 so the related signal should be tagged for REVISION 1 as well. Change-Id: I918de55c81779424011e42c358d5c7aeed2909ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix trying to open multiple windows if not supportedGiulio Camuffo2016-04-051-1/+3
| | | | | | | | We shouldn't special case some platform integration names, instead check if it supports the proper capabilities Change-Id: Ib8a28a974a4054cea4fbfb503be7c0e0f797e242 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Link Pepper plugin platform information to respective settingsKai Koehne2016-04-031-0/+2
| | | | | Change-Id: I1bd0c58a0cee3933370238841c12cf0c1d965c93 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: Fix documentation about cookie storesKai Koehne2016-03-291-1/+1
| | | | | | | | | | | | | Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move loadVisuallyCommitted signal to the test support APISzabolcs David2016-03-253-2/+5
| | | | | Change-Id: I877bbd8bc5c710370f135a27bcd7f0f7c95a7292 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Attribute, not flag, can be used for initializationLeena Miettinen2016-03-211-2/+3
| | | | | | | | | The Qt::AA_ShareOpenGLContexts attribute can be used to set up an OpenGL Context, instead of passing it in the constructor. Task-number: QTBUG-51379 Change-Id: I46bcb07fc69c0b8e7ac9bf632d328c15dca2ea45 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-211-2/+13
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
| * Doc: Move info about WebEngineCertificate methodsLeena Miettinen2016-02-241-2/+13
| | | | | | | | | | | | | | | | ...from WebEngine type to WebEngineCertificate type introduction. Change-Id: I8e8d7aae3f3cad6647a2a0537d2866c7827aba96 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | MSVC: Fix compiler warningKai Koehne2016-03-011-0/+1
| | | | | | | | | | | | | | | | | | Fix release build warning: api\qquickwebenginetestsupport.cpp(47) : warning C4100: 'success' : unreferenced formal parameter Change-Id: I3cdab22daa6b55abce55e217461952a192230428 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: Improve web engine profile class descriptionsLeena Miettinen2016-02-291-6/+18
| | | | | | | | | | | | | | | | Add information about the most important methods and properties. Change-Id: I41ae039a0cc6084b62b492560def5eed7d8d3742 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix WebAction muteAllan Sandfeld Jensen2016-02-131-1/+1
|/ | | | | | | | | WebAction mute was not working since it was setting its current state instead of the toggling mute. Change-Id: I9572c77e084e11b00f645845764fe13e0a603664 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-011-2/+66
|\ | | | | | | Change-Id: Ic2e3312f316dbe042e2103d3f19fde639faa2707
| * Doc: add documentation for the WebEngineScript itemLeena Miettinen2016-01-201-2/+66
| | | | | | | | | | Change-Id: Ice1b0a403686b4a280b2709a79fe2ed18ace3ab6 Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* | 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>
* | 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>
* | 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-092-2/+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>
* | 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>
* | 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-129-184/+335
| | | | | | | | | | | | | | | | | | 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-107-8/+8
| | | | | | | | | | | | | | 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-074-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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-012-5/+5
| | | | | | | | | | Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | 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>
* | Force creation of default WebEngineProfileKai Koehne2015-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | Make sure that the default QWebEngineProfile is created first. This creates the default WebEngineContext, which in turn initializes global things like AtExitManager. Task-number: QTBUG-49557 Change-Id: I9e8f6bd24edd7f4c7e8bb38d91a2c09631824828 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-201-1/+2
|\| | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| * 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>
* | use Q_ENUM instead of Q_ENUMSJoerg Bornemann2015-11-165-15/+15
| | | | | | | | | | | | | | | | This makes the enum values available as strings in qDebug, QCOMPARE and such. Change-Id: Id57a2002451337fcc8aedac673f834445913895c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix multiple symbol definition error with gold linker.Michael Bruning2015-11-061-2/+0
| | | | | | | | | | | | | | We should not need to include the moc'ed sources here anymore. Change-Id: I2417e71aac9495e6f85653c7636be882b02e8a74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Print JS console messages by defaultKai Koehne2015-11-061-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of QWebEnginePage/WebEngineView to print JavaScript console.warn and console.error messages by default in a 'js' logging category. This matches also the behavior for QtQml, where console messages end up in a 'qml' logging category by default. So far access to the JavaScript console required either use of the remote debugging functionality, subclassing of QWebEnginePage, or implementing a custom handler. Anyhow, even then writing a seamless forwarding of the data and metadata to the Qt message handler is difficult. This patches implements this forwarding by default. The behavior can be changed by either setting up rules for the 'js' category, e.g. setFilterRules("js.*=false"); or by implementing onJavaScriptConsoleMessage(), or overriding QWebEnginePage::javaScriptConsoleMessage. [ChangeLog] Unhandled JS console messages are now forwarded to to the Qt message handler inside a 'js' category. Change-Id: I5480383a80dcf7a122496f9b7915264ef9036db3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>