summaryrefslogtreecommitdiffstats
path: root/src/webengine
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-03-113-6/+22
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-083-6/+22
| |\ | | | | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| | * 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 iconChanged signal in Quick APIPeter Varga2016-03-082-3/+5
|/ / | | | | | | | | | | | | | | | | | | Do not emit iconChanged signal twice if icon url does not change. This fix implements the same behavior for icon handling in Quick as in the Widget API. Change-Id: I9fcc27c9cec3cbef74fb0a71026065e359a5cbc3 Task-number: QTBUG-51179 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add back revisions for QQuickWebEngineSettingsPeter Varga2016-03-032-18/+14
| | | | | | | | | | | | Change-Id: I5f53a8563c47c4a37c77932c5d6f7d084b324c4f Task-number: QTBUG-40043 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-02-231-1/+1
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-02-201-1/+1
| |\| | | | | | | | | | Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
| | * 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>
* | | Doc: Fix invalid character in the OverviewLeena Miettinen2016-02-231-1/+1
|/ / | | | | | | | | | | Task-number: QTBUG-51136 Change-Id: I647ea47714df2f33d0cdf448e0478fa0566aed83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add rudimentary printing API and add it to example.Michael Bruning2016-02-164-0/+341
| | | | | | | | | | Change-Id: I48141d07e9744bb21d64a5c8724579cb469ba35c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Rename UserScriptController/Host to UserResourceController/HostSzabolcs David2016-02-103-13/+13
| | | | | | | | | | | | | | These classes can operate user stylesheets too. Change-Id: Ia283af92e52a822b26003ff65e0e7dc391b0904d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-105-2/+97
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * 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: 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>
* | | | Doc: change comment notation to suppress QDoc warningsLeena Miettinen2016-02-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc fails to parse the token /* REVISION 2 */ in property declarations, but ignores // FIXME: Change-Id: I0811579a4e33db5f3c90ccc421b6bb7f63605304 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-044-2/+22
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * | | 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>
| * | 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>
* | | Add spell checker supportMichal Klocek2016-02-018-5/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate chromium spell checker: * add spellchecker and dependencies to build * underline misspelled words in html text areas * right-click context menu shows up to 4 options to correct the misspelled word * toggle spell check from context menu * add new qml and widget api calls to qwebengineprofile to enable/disable spell check, select spell check language, get list of supported languages/dictionaries * register new qml spell check properties for QtWebEngine 1.3 * CONFIG+="no_spellcheck" to remove spellcheck support Change-Id: Ie61434ab9493597d7759a6f33794f6859c4e3a4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Unify license header usage.Jani Heikkinen2016-02-0158-594/+757
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Extend HttpCacheType with NoCache optionSzabolcs David2016-01-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to disable cache with passing NULL as cache backend. It behaves the same way as using HttpCache::set_mode(DISABLE), but saves some memory without instantiating backend factory. Change-Id: I1565cc773eda21a6bc73eebe14ab8046252a7755 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-184-6/+20
|\| | | | | | | | | | | Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
| * | 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>
* | | Add API to set WebChannel on isolated worldAllan Sandfeld Jensen2016-01-153-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to set a web-channel so that it can only be accessed by private scripts. Pulls in needed API extension in 3rdparty. Task-number: QTBUG-50318 Change-Id: I61bcce5c318dffe0a406ee8cddf31f58a021c22c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-1230-309/+660
|\| | | | | | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * | 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>