summaryrefslogtreecommitdiffstats
path: root/src/webengine/api
Commit message (Collapse)AuthorAgeFilesLines
* Fix nullpointer dereferencing errorViktor Engelmann2016-10-121-1/+1
| | | | | | | | | Check whether iconUrls is NULL before calling contains(iconUrl) on it, which, under certain circumstances, caused a SEGFAULT. Task-number: QTBUG-56330 Change-Id: Ia167d68a4c4d62af4740a8cbab2686bfbc975455 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-041-1/+1
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49d99b5ac2cfba243eda1ea705c2a7d71b5542f6
| * Doc: Fix initialize() documentationMichal Klocek2016-09-301-1/+1
| | | | | | | | | | | | | | | | We do not share context between "processes", but between "threads" Change-Id: I20f558f913c1f19fc469ade6faab45762f42d528 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-244-11/+13
|\| | | | | | | | | | | | | Conflicts: src/webengine/api/qquickwebenginesettings.cpp Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
| * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-233-9/+9
| |\ | | | | | | | | | Change-Id: I3e152ee134ed38628d1bf9571df58f469b29e74b
| | * Fix crash when using openIn on newly created viewv5.6.2Christophe Chapuis2016-09-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. (cherry picked from commit bfc2683ab4ca3f56a2effd1b2f7e68850acb72ba) Task-number: QTBUG-55765 Change-Id: Iaa7cb4e8c7780a2e3f1a8c85b7b5da0ec541b2f3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Doc: Fix types of \qmlpropertyKai Koehne2016-09-193-9/+9
| | | | | | | | | | | | | | | Change-Id: Ie355f72a0bf575e66ab465fb2fcada0430ed8c7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Fix crash when using openIn on newly created viewChristophe Chapuis2016-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a link triggers a NewViewRequest, and the latter creates a new window with a new WebEngineView inside, the "adapter" pointer can still be NULL when the adoptWebContents is called by openIn. Therefore is it necessary to test the adapter pointer before using it. Task-number: QTBUG-55765 Change-Id: Ia1a299dd65c229705462c9444b81d7b26567fc09 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Doc: Fix types of \qmlpropertyKai Koehne2016-09-202-6/+6
| | | | | | | | | | | | | | | Change-Id: Ibb470580404f2b09dc8c7c2de275ade97251d612 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-09-121-1/+1
|\| | | | | | | | | | | Change-Id: I9acebc9f1d01ab9041f75c49749f8a122ffbfe30
| * | Improve QWebEngineSettings::JavascriptCanOpenWindows docsFlorian Bruhin2016-09-061-1/+1
| |/ | | | | | | | | Change-Id: I44105c768a958714590b979d3877724f0db659ee Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-166-53/+48
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| * Doc: Add type name to enumeration values to follow the doc conventionLeena Miettinen2016-08-095-32/+48
| | | | | | | | | | Change-Id: I86eea3a64a38f6ec9984f663499abffa03cd9eb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Move WebEngineView property docs to webengine.qdocLeena Miettinen2016-07-291-20/+0
| | | | | | | | | | | | | | | | | | The docs do not currently get built, because docs for a QML type need to reside in one file. Also edited the docs for grammar and style. Change-Id: Ic62f293e113d0e4bfe0497ce4a665a2a42971eb3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Doc: Add type name to enumeration values added in Qt WebEngine 1.3Leena Miettinen2016-08-084-15/+22
| | | | | | | | | | Change-Id: I8f3aa86b451e57d01937559e595a439529a839ce Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-023-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| * Switch WebContentsAdapter to using shared pointersAllan Sandfeld Jensen2016-07-013-9/+9
| | | | | | | | | | | | | | | | | | QExplicitSharedDataPointer is meant for value objects, not for shared objects. Instead switch to using QSharedPointer. Change-Id: Ib3791bbcfde627a67508f2819e141d8c538a4a50 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-272-1/+37
|\| | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| * Fix memory leak of unhandled certificateErrorMichal Klocek2016-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user does not handle onCertificateError the instance of QQuickWebEngineCertificateError never gets to JavaScript land and never gets deleted. Create a strong reference before emitting the onCertificateError to guard against the memory leak. Change-Id: I49dbf89445d32291e2f52976f0f5e9deda201fcb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Override short-cuts to common editor commandsAllan Sandfeld Jensen2016-06-222-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure Chromium is given a chance to handle editor commands, we must override these short-cuts. On OS X we must also perform the action afterwards as these are not handled internally by the Blink Editor. The patch solves copy/paste in flash plugins and copy/paste on OS X when no application short-cuts have been defined. The handling of short-cut override events is based on how it was handled in Qt WebKit Task-number: QTBUG-54221 Change-Id: I748671c7bfa5662aae16c6a4b9bbe5e2bce1b907 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
* | Doc: Fix the documentation of WebEngineContextMenuDataAdam Kallai2016-06-201-8/+8
| | | | | | | | | | Change-Id: I7ce66ad2f1c1c6a408637c5c541cba22c7260591 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-173-3/+10
|\| | | | | | | Change-Id: If4d8a25f5a2192a658d031252435935cbc675725
| * Fix access to deleted memory on QWebEnginePage destructionJoerg Bornemann2016-06-162-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose QWebEnginePage is destroyed while there's still a combobox popup open. We would crash with the following stack trace: 1 QtWebEngineCore::RenderWidgetHostViewQt::dpiScale 2 QtWebEngineCore::RenderWidgetHostViewQt::GetViewBounds 3 content::RenderWidgetHostImpl::SendScreenRects 4 content::RenderWidgetHostImpl::OnRenderViewReady ... 16 base::MessageLoop::DoWork 17 WebEngineContext::destroy 18 `anonymous namespace'::destroyContext 19 qt_call_post_routines 20 QApplication::~QApplication RenderWidgetHostViewQt still holds a pointer to WebContentsAdapterClient. To fix this, expose the QObject owning the adapter client, and hide RenderWidgetHostViewQt when it is destroyed so it won't try to render. Change-Id: Ide5543197b35038a3e1c7491ceda3f5ad10f6f07 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add missing Q_DECL_OVERRIDE specifiers.Joerg Bornemann2016-06-132-3/+3
| | | | | | | | | | | | | | | | Fixes warnings when building with clang. Task-number: QTBUG-51295 Change-Id: I4ede7e4ea5c1c3924b3bba852834b8066b539825 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge remote-tracking branch 'origin/5.6.1' into 5.6Allan Sandfeld Jensen2016-06-081-0/+1
| |\ | | | | | | | | | Change-Id: Ic2fad2311550860c5a2f83b6f228a7a648131ece
* | | Expose WebEngineProfile.clearHttpCache()Kai Koehne2016-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The method is documented to be available in the QML API, but hasn't been exposed so far. Change-Id: I6f2b8ae132dc10718f1b9181eefeef5c2f2eeed6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-05-312-0/+19
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-312-0/+19
| |\| | | | | | | | | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| | * | Disable qtquickcontrols context menu on eglfsMichal Klocek2016-05-302-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Quick Controls 1 always creates "native" windows for popups, however it does not check if the platform can support creating "native" windows. As a workaround disable context menu until Qt Quick Controls 2 are in place. Task-number: QTBUG-53467 Change-Id: Iea32e19f256f3d7e81a61e23f7da64dfc7ec660d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Disabled WebEngine views should not receive focus.Alexandru Croitor2016-05-262-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a QWebEngineView or a QQuickWebEngineView is disabled using setEnabled(false), after loading a web page, the views are automatically focused, and a user might see a blinking caret in an html input for example, even though the user can't interact with it. Fix consists in not calling the Focus() method whenever a view is disabled. Change-Id: I1014fb5898a5ddf01a4e9b14c3eaf5d4006e5131 Task-number: QTBUG-53159 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | | | Fix crash related to audioMuted and recentlyAudible properties in qml.Alexandru Croitor2016-05-311-8/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the qml properties audioMuted or recentlyAudible are accessed / set on a WebEngineView on application startup, the application will crash due to accessing a null pointer (the web contents adapter is not allocated yet). Add guards against null pointer access, to prevent the crash. Change-Id: I939be9afa093d1889024b2ff9308deb88b9316bf Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7.0' into 5.7Allan Sandfeld Jensen2016-05-312-1/+2
|\ \ \ | | | | | | | | | | | | Change-Id: I00f64f15ec2aee18d8e6c7b5f59dfae49be1cba8
| * \ \ Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-261-0/+1
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I01bc98f034ea26414d071fc42fe20bd0b7534b9e
| | * | Fix compile issueFrank Meerkoetter2016-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building qtwebengine failed with Yocto2.1/GCC5.3 with an IMX.6 ARM target. Adding the include fixed the issue. compiling .moc/moc_qquickwebengineview_p.cpp .moc/moc_qquickwebengineview_p.cpp: In static member function 'static void QQuickWebEngineView::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)': .moc/moc_qquickwebengineview_p.cpp:866:72: error: invalid use of incomplete type 'class QColor' case 15: *reinterpret_cast< QColor*>(_v) = _t->backgroundColor(); break; ^ In file included from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qobject.h:48:0, from /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/QObject:1, from .moc/../api/qquickwebenginescript_p.h:52, from .moc/../api/qquickwebengineview_p.h:52, from .moc/moc_qquickwebengineview_p.cpp:9: /data/projects/fsl-community-bsp/build/tmp/sysroots/wandboard/usr/include/qt5/QtCore/qmetatype.h:1886:1: note: forward declaration of 'class QColor' Change-Id: If58315d4c0b5087705687ae582ffe86702063937 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7.0Michael Bruning2016-05-232-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-platform-notes.qdoc tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
| | * | Doc: Add a topic listing supported featuresLeena Miettinen2016-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some features from the platform notes to the new topic. Change-Id: I23bb0593a0e142a18ad4216a03bfe1935965fc10 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-201-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/browser_context_adapter.cpp src/core/web_contents_adapter.cpp tests/auto/widgets/qwebenginepage/BLACKLIST Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
| * | | Silence zero-as-null-pointer=constant warningsAllan Sandfeld Jensen2016-05-191-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | This appears to have been added to headerclean and is now preventing us from integrating. Change-Id: I7c25a85c0d62c945d4f4a68f559000fab8c880cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Add missing new certificate error typeAllan Sandfeld Jensen2016-05-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the new certificate error CertificateValidityTooLong and adds asserts to ensure this list is kept up to date in future Chromium updates. Change-Id: I6066296c0a09cabcca446f1d0b3e3d458b3f158e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Fix revision of defaultTextEncoding[Changed]Kai Koehne2016-05-131-2/+2
| |/ |/| | | | | | | | | | | Both property and signal actually where already part of QtWebEngine 1.0 Change-Id: I9534f35199a3c70d78f9f42e3ea6b9f3b462d6b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove notifier signals for spellchecking supportTopi Reinio2016-05-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the spellchecking support was removed with d364c05d. These notifier signals were left behind, and caused them to be documented. Related documentation warnings: qquickwebengineprofile.h:144: warning: No documentation for 'QQuickWebEngineProfile::spellCheckLanguageChanged()' qquickwebengineprofile.h:145: warning: No documentation for 'QQuickWebEngineProfile::spellCheckEnabledChanged()' Change-Id: I3b03f3f22ed984d55c09d6e42a258f961c42c584 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Remove spellchecking supportMichal Klocek2016-05-066-141/+1
| | | | | | | | | | | | | | | | Spellchecking API needs a bit more reviews and love. Current API is not intuitive and partly broken. Change-Id: Ie9cd371f38cca2f6b3f56a8699ad874cd332c318 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Doc: Document how dictionaries are loadedMichal Klocek2016-05-041-0/+15
| | | | | | | | | | Change-Id: I366e35b6de0a46be648de3130eb7d8585fc1a694 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Combine candidate icons for a page into a single iconPeter Varga2016-05-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | For the Widget API the QIcon returned by QWebEnginePage::icon() function contains all the candidate icons for the current page. For the Quick API the QQuickWebEngineFaviconProvider provides the best quality icon for the requested size from the candidates. Task-number: QTBUG-51179 Change-Id: I42b8427f957e2f2fc745dd0111bedcc71b577216 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove availableDictionaries from spellcheck apiMichal Klocek2016-05-042-26/+0
| | | | | | | | | | | | | | | | | | | | | | This method is broken, since SpellcheckerService is lazily initialized and dictionaries might be not loaded yet. Moreover there is a missing implementation on mac. Instead log warning when SpellcheckService can not load dictionary. Change-Id: Ifa2e769d83307543fa6cdf529475e9ab980022f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Remove WebAudio settingsAllan Sandfeld Jensen2016-05-022-25/+0
| | | | | | | | | | | | | | | | | | In Chromium 51 WebAudio will be always on, and can not be runtime enabled or disabled. We should avoid introducing a setting we can not even support in the next version. Change-Id: I42f7d4f3f7f952f38361ef73dfe7b318ea1a4cf5 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Allan Sandfeld Jensen2016-04-285-17/+28
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-04-255-17/+28
| |\| | | | | | | | | | Change-Id: I329397621f19ba3890be5daf44a6bb2d668ad2d8
| | * Doc: Improve WebEngineHistoryListModel documentationKai Koehne2016-04-211-6/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ica5adc508113678747c20a9807ad09eaae79ccb1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Use the temporary zoom factor to set the zoom factorMichael Bruning2016-04-212-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that using the temporary zoom factor is meant to set the zoom factor for one certain view, and this is actually what we want. Also added auto tests for this. Task-number: QTBUG-51851 Task-number: QTBUG-51969 Change-Id: I8912cbc25637d3c1681026380a2ab3068a964868 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 05:25:59 +0000