summaryrefslogtreecommitdiffstats
path: root/src/webengine
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>
* Doc: initializing web engine when running it as a pluginLeena Miettinen2016-04-111-0/+18
| | | | | Change-Id: I27981327fb563fdd6697352582c2cbc99b173ccc Reviewed-by: Kai Koehne <kai.koehne@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-052-0/+4
| | | | | | | 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: Replace "web engine script" with class and type namesLeena Miettinen2016-04-051-2/+3
| | | | | Change-Id: I644475dc966b9a0a13bba242b653d2bc2357f24b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Doc: Link Pepper plugin platform information to respective settingsKai Koehne2016-04-032-4/+8
| | | | | Change-Id: I1bd0c58a0cee3933370238841c12cf0c1d965c93 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* OSX: Fix QSurfaceFormat check to allow < 3.2 OpenGL profiles.Alexandru Croitor2016-03-311-4/+9
| | | | | | | | | | | | | | | | | | | Currently if a < 3.2 OpenGL Compatibility profile is requested on OSX, a webengine application would crash saying that the global profile does not match the default profile. That happens because in the Cocoa QPA any requested OpenGL Compatibility profile or Core profile with version smaller than 3.2 gets reset to QSurfaceFormat::NoProfile and version 2.1. Fix consists in making sure that the QSurfaceFormat check only considers Core profile with versions >= 3.2. All other combinations would result in NoProfile 2.1 and thus not cause any issues for webengine. Change-Id: I7c9866d761c052e52389022abe8e213d062db41f Task-number: QTBUG-51058 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Fix documentation about cookie storesKai Koehne2016-03-292-2/+2
| | | | | | | | | | | | | 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: Restructure paragraph about loading pagesLeena Miettinen2016-03-241-3/+2
| | | | | | | | Describe the "loading" property first and remove the "LoadStatus" enumeration. Change-Id: I2357c604197c305e9cd2d3ff7dd322949b1b9e4b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Improve docs for the zoomFactor propertyLeena Miettinen2016-03-231-1/+1
| | | | | | | | In the WebEngineView type and QWebEnginePage and QWebEngineView docs. Change-Id: Ibbabcf6cc38a48fb14abb105f5fda4c03a89ccba Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Doc: Quote example code from the Minimal exampleLeena Miettinen2016-03-232-58/+12
| | | | | Change-Id: I0050a0090e4e0877dc56b8c529d9cbb77a0cdd33 Reviewed-by: Kai Koehne <kai.koehne@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-2110-35/+244
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
| * Doc: Mention target platform limitationsKai Koehne2016-02-251-0/+13
| | | | | | | | | | | | | | | | | | In particular that Windows XP is not supported. Task-number: QTBUG-49900 Change-Id: Ib487ac6efac81a08c2d6fd20e6768561878d9020 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Doc: fix copy/paste error in the overviewLeena Miettinen2016-02-251-1/+1
| | | | | | | | | | Change-Id: Id9d633f5a68d563d2266743c5ecd2572f9da89c2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Doc: Refer to Pepper instead of Adobe Flash PlayerLeena Miettinen2016-02-241-4/+5
| | | | | | | | | | | | | | The old version confused a user. Change-Id: I67178d64489a9502a146f386dfce758aa7dd7586 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Doc: Add intro to WebEngineView type docsLeena Miettinen2016-02-241-2/+117
| | | | | | | | | | | | | | | | | | | | - Initializing the web engine. - Describe the properties, signals, and methods of the type in the type Description. - Refer to related types and utility types. Change-Id: Ia851732051500498bfebd6d56f38ca1629ac3dfa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Doc: Improve the overviewLeena Miettinen2016-02-244-15/+84
| | | | | | | | | | | | | | | | - Add module diagrams and descriptions of main classes - Add initializing Qt WebEngine Change-Id: I29f3e9aadbcc86b09c722d1c63b4a5c2c585d215 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Doc: Move info about WebEngineCertificate methodsLeena Miettinen2016-02-242-11/+15
| | | | | | | | | | | | | | | | ...from WebEngine type to WebEngineCertificate type introduction. Change-Id: I8e8d7aae3f3cad6647a2a0537d2866c7827aba96 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * 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>
* | Flash: document --ppapi-flash-version argumentKai Koehne2016-03-101-0/+8
| | | | | | | | | | | | Change-Id: I9260a5cc4b5e027a46fc22752c1dca62484dd595 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: Building with macx-clang-32 not supportedLeena Miettinen2016-03-071-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-51139 Change-Id: I0597651b9722e0a62f2c569980f183dd2df00221 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* 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