summaryrefslogtreecommitdiffstats
path: root/src/webengine
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7.1' into 5.7Allan Sandfeld Jensen2016-11-211-1/+1
|\ | | | | | | Change-Id: Ifcf7423fa8d892ddad595300e33a09c7f63f5e6e
| * 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-11-044-15/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc, use the macro \macos. Conflicts: src/core/media_capture_devices_dispatcher.cpp src/webengine/doc/src/qtwebengine-deploying.qdoc src/webengine/doc/src/qtwebengine-platform-notes.qdoc Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
| * | Pepper flash search-path for package adobe-flashpluginViktor Engelmann2016-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since version 54, the chromium distribution package does not contain the pepper flash plugin anymore. Because of this, the plugin cannot be installed using the Ubuntu package "pepperflashplugin-nonfree" anymore (because the package pulled the plugin from the chromium distribution). The plugin is also contained in the package adobe-flashplugin, which installs the file to /usr/lib/adobe-flashplugin/libpepflashplayer.so. [ChangeLog] Pepper flash is now also searched in /usr/lib/adobe-flashplugin/ Change-Id: I7c135a2eac1628b0d338bbfed07695c9578458e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-10-312-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except in link targets where QDoc does not expand macros. Change-Id: Icad4e7817d93b9e7b0e1a9a13a8618b3341ab2ba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Add missing override to initializeEngine in pluginMichal Klocek2016-11-021-1/+1
| |/ |/| | | | | | | | | Task-number: QTBUG-56870 Change-Id: I36338a1a29bc4e82f5c84cfa1ea641b8df3b5f4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Doc: Set the correct indexTitle for C++ Classes pageTopi Reinio2016-10-061-3/+3
| | | | | | | | | | | | | | | | | | ... and mention namespaces in the title, listing the namespaces with a group selector. Change-Id: I06056beba464a441ab56cb0acbfb0440c0878f0d Task-number: QTBUG-56298 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-043-1/+16
|\| | | | | | | | | | | | | 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>
| * Propagate the view's screen coordinates on global position change in QuickPeter Varga2016-09-272-0/+15
| | | | | | | | | | | | | | | | | | Based on widget solution: 1e83a2d1b61b13323163dfe8cac64dad397cb202 Task-number: QTBUG-55650 Change-Id: I6df45e7e018fa201c50fe81e8679c36f97ddeb1e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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-203-9/+9
| | | | | | | | | | | | | | | 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>
* | Doc: Add type name (WebEngineView) to the SavePage enum value in docsLeena Miettinen2016-09-081-1/+1
| | | | | | | | | | Change-Id: Ica90790662929f1141419ccd38d34d3c9d55be32 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-08-311-3/+3
|\| | | | | | | Change-Id: Ic739ab9db0851cc13467168840ea2549996432f8
| * Clicking on a select box option, did not workAdam Kallai2016-08-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There was introcuded a new logic which proves that no mouse / keyboard events are forwarded to Chromium if the view has no focus, and activeFocusOnPress is set to false. The selection box get focus when the user click on it, but the popup window never get (focus is on QuickRootItem) in this case these mouse events are ignored to forward to Chromium. Task-number: QTBUG-54795 Change-Id: Id6e81ee39dcde21a6c5c46e302888b9e9478352f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-1610-111/+154
|\| | | | | | | | | | | | | | | | | | | 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-096-89/+107
| | | | | | | | | | Change-Id: I86eea3a64a38f6ec9984f663499abffa03cd9eb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add Qt WebEngine to list of "All QML Modules"Kai Koehne2016-08-051-0/+1
| | | | | | | | | | | | | | This list is shown in qtdoc/qmlmodules.html Change-Id: Ib51f0405e7581571f8a124ea6806e7bc4982dba3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix issue where Chromium thought it had active focusAlexandru Croitor2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when a WebEngineView's RenderWidgetHostViewQtDelegateQuick had focus, but not activeFocus, Chromium was told that it had keyboard focus. That is not correct, because having focus inside the FocusScope (the WebEngineView), does not mean it has keyboard focus, it just means the RWHVQDQ will receive active focus, when the WebEngineView does. The call path for that erronous check was done when a new page was loaded, specifically going through NavigatorImpl::DidNavigate() -> RenderFrameHostManager::CommitPending() -> render_frame_host_->GetView()->HasFocus() -> RenderWidgetHostViewQtDelegateQuick::hasKeyboardFocus(), which resulted in incorrect display of a blinking caret in an input, when the view actually wasn't focused. The fix consists in checking for the activeFocus rather than the focus property. Change-Id: I97002be3fc8adfec2228a1b5ad62696f8872d3cc Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Explain how to support High DPI devices in applicationsLeena Miettinen2016-08-041-0/+25
| | | | | | | | | | | | Task-number: QTBUG-54114 Change-Id: I63ae6c47eb76a4acf85cd5b0c7adb21399a985dd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Move WebEngineView property docs to webengine.qdocLeena Miettinen2016-07-292-20/+20
| | | | | | | | | | | | | | | | | | 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: Describe deployment of Qt WebEngine applicationsLeena Miettinen2016-08-091-26/+97
| | | | | | | | | | | | Task-number: QTBUG-55142 Change-Id: I1255269730bb3b5ae13e2128743da421589c26c8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Add type name to enumeration values added in Qt WebEngine 1.3Leena Miettinen2016-08-085-142/+149
| | | | | | | | | | Change-Id: I8f3aa86b451e57d01937559e595a439529a839ce Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Move "Target Platforms" to deployment topic from "Platform Notes"Leena Miettinen2016-08-082-13/+14
| | | | | | | | | | Change-Id: I178260c8356afaada989abfb2a1218d4ce0f134e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Move info about deployment on Windows from qtdoc moduleLeena Miettinen2016-08-041-0/+22
| | | | | | | | | | | | | | This information was in the "Qt for Windows - Deployment" topic. Change-Id: I309a53001695f8d287c819852a3457a75ec17657 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: Move info about deploying Qt WebEngine apps into a separate topicLeena Miettinen2016-08-033-12/+45
| | | | | | | | | | | | | | | | Move information from the Qt docs here in a follow-up change. Also add information in more follow-up changes. Change-Id: I420dcb879332b298247867768e59a736ef466081 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-029-81/+1988
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Doc: Link to QWebEngineProfile::downloadRequested from WebActionLeena Miettinen2016-07-251-1/+3
| | | | | | | | | | | | Task-number: QTBUG-54644 Change-Id: Ief2e92e6baf3057cb4c1835557c51c4728c34ec0 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Doc: Move details about script injection in overview to separate sectionKai Koehne2016-07-211-13/+18
| | | | | | | | | | Change-Id: I51562b2dff1ffe4359c6db4a802c406c3706de84 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Condense documentation for Qt WebEngine ProcessKai Koehne2016-07-211-6/+3
| | | | | | | | | | Change-Id: Idf18d236816aab12fb01e1b5725e5ad1c73dbaad Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Replace ambiguous reference to 'C++ implementation'Kai Koehne2016-07-211-3/+3
| | | | | | | | | | | | | | Qt WebEngine and Qt WebEngine Core also have C++ API. Change-Id: I4fa4219cd9c0a984f736585caf84676e64f1155a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move mentioning of QSG in overview to WebEngineWidgets moduleKai Koehne2016-07-211-5/+4
| | | | | | | | | | | | | | | | | | | | Currently it was placed under WebEngineProcess, which is confusing. That the scene graph is used for the QtWebEngine module is probably not really interesting, but it's certainly suprising for Qt WebEngine Widgets, hence mention it there. Change-Id: I1a87b0b0d32cc2695c4dfa31aae56c517e39124e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Use \note tagKai Koehne2016-07-211-1/+1
| | | | | | | | | | Change-Id: Ie82c3b34974b391ca69f82d00165c0d46ad6b4af Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move WebKit comparison to porting guideKai Koehne2016-07-211-4/+1
| | | | | | | | | | | | Change-Id: I75d3f5641ccd402ea1a167d14533b70df5744ff7 GPush-Base: 8ca4a41dfe6887c2637fe2e562f5314b56facd20 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Move Platform notes into separate section in OverviewKai Koehne2016-07-211-4/+6
| | | | | | | | | | | | Change-Id: I40d9c30dd33eb38d1d33c68df4cb4bbc3704c647 GPush-Base: 8ca4a41dfe6887c2637fe2e562f5314b56facd20 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Doc: Fix WebEngine module diagramLeena Miettinen2016-07-204-0/+1915
| | | | | | | | | | | | | | | | | | | | - Fix typo - Add dependencies between submodules - Add sources for diagrams Task-number: QTBUG-54382 Change-Id: I88aa1dfd0ba16f3d3ca26d8c9cfa05b0ec1e9c83 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Introduce new 'Related Modules' section in OverviewKai Koehne2016-07-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Consolidate the description of related modules in a separate section, and place them less prominently at the end of the overview. Also - remove mentioning of (ambiguous) 'web runtime' - fix spelling of supersede Change-Id: Iccac376a6b602ee9d23efd4b856e65b9292d6382 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * 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>
| * Doc: Do not explicitly mention names of signal handlersKai Koehne2016-06-281-13/+2
| | | | | | | | | | | | | | | | | | | | You can also connect arbitrary methods using the Connections type, or the connect() method. Anyhow, this is standard QML behavior, so no need to mention it in every signal. Change-Id: I419c74eee7ce190c44336d9f25c1a3aa30f36ab4 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Doc: Specify types of qmlsignal argumentsKai Koehne2016-06-271-10/+8
| | | | | | | | | | Change-Id: I8694de2fa43eb7d343e8abcb617939dafab59ebc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Doc: Update to Chromium version used in 5.7Leena Miettinen2016-07-251-1/+1
| | | | | | | | | | Change-Id: I6ace25fc3085f7816d128be651d00040de6e53d6 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Doc: Fix grammarLeena Miettinen2016-07-211-1/+1
| | | | | | | | | | | | | | | | A list of three items requires that the verb in the leading sentence take the plural form "are". Change-Id: I054d37d891db3ec1a372b22e9707a59cdaf84922 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix building on OS X 10.9 with 10.10 SDKAlexandru Croitor2016-07-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously building on OS X 10.9 was only allowed with a 10.10.3 SDK. But there is no supported version of Xcode on 10.9 that would ship with that SDK, which lead to the fact that there was no way to compile WebEngine with an officialy provided toolchain. This patch lowers the requirement of the SDK to 10.10, at the expense of disabling usage of API that was added in the 10.10.3 SDK release (Force Touch API). The required minimum Xcode version is thus bumped to 6.1, and the documentation is updated accordingly. Task-number: QTBUG-54486 Change-Id: I025caa336ceac5b8ea76ef451eb5e6b78abfe0c9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-276-6/+51
|\| | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7