summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Restore ability to build with Qt 5.7v5.8.0-alpha1Allan Sandfeld Jensen2016-08-283-5/+5
| | | | | | | | Defines the qtConfig() test for older Qt versions, and fix conflict between two QSGRectangle definitions. Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add setting to enable printing of CSS backgroundsMichael Bruning2016-08-288-3/+42
| | | | | | | | | | | [ChangeLog][Printing] Printing will now include the CSS background of the printed elements by default. This restores the default behavior from Qt WebKit. It can be controlled via the PrintElementBackgrounds web setting. Task-number: QTBUG-54918 Change-Id: I37c37456dfec6368f22c36c515ac3cad1bbf8006 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Doc: Additional Chromium extensions are supported since Qt 5.8Leena Miettinen2016-08-253-3/+6
| | | | | | Task-number: QTBUG-55242 Change-Id: Ia02ffaff1c0c39dc61b4aa73b11f8f9a6f7bc174 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Autocomplete view-source URLPeter Varga2016-08-241-1/+13
| | | | | | | | | | | User may miss the URL scheme (eg. http://) when type a view-source url into the browser's location bar (eg. view-source:qt.io). This is not handled by the Chromium thus will produce an empty view-source page. The new autocompletion extends the incomplete view-source URL thus it will provide valid URL if it is possible (eg. view-source:http://qt.io/) Change-Id: I3edcd271cd0a971c9754e875db8f2a55a9a545de Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Enable PDF for desktop platforms and add chromium dependenciesMichael Bruning2016-08-247-3/+15
| | | | | | | | PDF is enabled globally, but disabled for the embedded platforms currently Change-Id: I44e1ffc8587ff8d8e677a47f8048feaef2e3266a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add core code for printing PDF data using PDFiumMichael Bruning2016-08-244-0/+303
| | | | | | | | | | | Enables printing PDFs to QPrinters via PDFium. Bitmap to QImage conversion code based on code by Paulo Pinheiro <paulovap.os@gmail.com> Task-number: QTBUG-50556 Change-Id: I536200dc3dc56109624959b1d3d4644e4c20d1c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add widgets API for printing on a QPrinterMichael Bruning2016-08-249-42/+150
| | | | | | | | | | | | | | | Renders the content to a PDF document and then renders this on a QPrinter-backed QPainter using the PDFium library. PDFium bitmap to QImage conversion based on work by Paulo Pinheiro <paulvap.os@gmail.com>. [ChangeLog][QtWebEngineWidgets][Printing] Enables printing QWebPage content on a QPrinter. Currently does not support previewing the document. Widgets only for the moment. Change-Id: I9a5264433093379aee90f5e4f69bf2aee8814f2b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Work-around moc issueAllan Sandfeld Jensen2016-08-232-1/+5
| | | | | | | | | Recent moc appears to have trouble parsing http_status_code.h, but it is only included due to an unnecessary include in web_engine_context.h we should have used a forward declaration for. Change-Id: Idd586bdb7719627b951a32905e4207fa8db0393d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-237-23/+22
| | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge dev into 5.8Oswald Buddenhagen2016-08-2214-279/+423
|\ | | | | | | Change-Id: I23aa7e41dfbbb7c4e4259a32868e64c58c0a1310
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-1614-279/+423
| |\ | | | | | | | | | Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
| | * 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
| | | * Update ChromiumAllan Sandfeld Jensen2016-08-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in security updates from Chromium 52 Change-Id: I4fb5183a321b45fdf5515f0a88100b48697ee3aa Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * 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>
| | * | Check if gpu fence is supported in pullTextureMichal Klocek2016-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53972 Change-Id: Ie722e40e4763c5a78ce566d03fec6877d64b2023 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | 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>
* | | | Fix crash on changing persistent storage pathAllan Sandfeld Jensen2016-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deletion of HttpNetworkSession references the old HttpServerProperties so delete the session before we replace the properties. Task-number: QTBUG-55322 Change-Id: I420dc0523fda44423adaa5f4f0fa1df9ade4b584 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | | Add Qt Quick Controls2 support for ToolTipAdam Kallai2016-08-202-0/+46
| | | | | | | | | | | | | | | | | | | | Change-Id: I11b4990aea218a5cfd5d2365a9af0162ec9b500a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Add Qt Quick Controls 2 support for dialogsMichal Klocek2016-08-1817-58/+809
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQuickControls1 does not handle embedded platforms too well. In case of eglfs platform we crash badly - only one window is supported. QtQuickControls2 on the other hand lacks the native look on desktop. Therefore on desktop platforms keep using QtQuickControls1, and on eglfs use QtQuickControls2. QtQuick.Dialogs are not implemented for QtQuickControls2, moreover required authentication dialog and prompt dialog are neither implemented in QtQuickControls1. As a workaround make new dialogs to give consistent look and feel. Replace close() with reject() signal in java script prompt dialog to unify handling between qqc1 and qqc2 [ChangeLog][QtWebEngine][General] Qt WebEngine (QML) now optionally uses Qt Quick 2 Controls to show standard dialogs. Task-number: QTBUG-53467 Task-number: QTBUG-51177 Change-Id: I42f9506357bbb82d4f04465f30a18c8013439e25 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Add focusOnNavigationEnabled settingAlexandru Croitor2016-08-0914-11/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The focusOnNavigationEnabled setting allows changing the behavior of whether a WebEngine view (widget or quick) will automatically get focus, whenever a navigation action happens (load, reload, previous history entry, etc). The default behavior before this patch was to always grab the focus. [ChangeLog][QtWebEngine][General] Add focusOnNavigationEnabled setting which allows controlling whether a web view will receive focus on a navigation request. Previously the view always received the focus. Task-number: QTBUG-52999 Change-Id: I6d30d973a41b53011131f21dcecbf6ec4d652759 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Make UserPrefs available without spell-checkingAllan Sandfeld Jensen2016-08-055-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | Autofill and other components also need user preferences, so make it included by default. Change-Id: Id63241b2239451456ca8a8e1cd9771df4d48b8b8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-0551-256/+2435
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * | 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-0238-209/+2175
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Do not use proxy when connecting to localhostErwin Kandler2016-07-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium does not exclude localhost connection from its proxy rules by default. When using a qt proxy with any other form of qt-based connections, connections to localhost are excluded by default. This patch adds localhost connections to the proxy-bypass rules. Change-Id: I76c43a2ae0de8d8fad455445a64a739c6c6b40f0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-276-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Prevent a crash after having downloaded a fileAndy Shaw2016-07-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the profile owns the QWebEngineDownloadItem then it is likely that it will still be around when the QWebEngineProfile is deleted. As the QWebEngineDownloadItem is a child of the QWebEngineProfile then it will try to delete it when deleting the QWebEngineProfile which means it cannot trigger a function call into QWebEngineProfilePrivate. Change-Id: I51077a7857fb49a6708224a9e9942d17de6f6778 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * 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-212-4/+8
| | | | | | | | | | | | | | | | | | 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>
| | * Add persistent backend to channel id serviceAllan Sandfeld Jensen2016-07-194-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Channel-ids are only supposed to be memory only when running in off the record profiles. We have just never initialized the sql-based backend. We follow the cookie-settings, because channel-ids are used together with cookies, have similar implications, and newer Chromium versions will assert that cookie-store and channel-id store have matching storage models. Change-Id: I0a64146f0ed36a8913706bfc3fcadd7404894745 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Fix regression in updating cookie store settingsAllan Sandfeld Jensen2016-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | A copy-paste error meant we only updated user-agent settings when cookie store settings changed on a profile. Change-Id: I173ea7dfc309a30a3d3b98ee5ccab74e2abec456 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Improve OpenGL implementation checkAkihiko Odaki2016-07-131-8/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebEngine uses `isOpenGLES` to know whether the OpenGL implementation is EGL with OpenGL ES 2.0. However, some non-ES OpenGL implementation such as eglfs_x11 uses EGL and are compatible with OpenGL ES 2.0. This change allows to use them. Also the change will allow to detect incompatible combinations. (i.e. EGL + ES-incompatible OpenGL, API other than EGL + OpenGL ES) Change-Id: I0abea253696d06ec365bde2176663700e8567f45 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Propagate the view's screen coordinates on global position changeJoerg Bornemann2016-07-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose having a QWebEngineView as one of many child widgets in a layout. Resize some child widget such that the position of the QWebEngineView changes (without changing the position of the top-level window). Chromium must be informed of the changed global position, otherwise popups will be opened at the old position. Also see commit 7f941a34, which originally introduced the coordinate propagation for top-level window moves. Task-number: QTBUG-51244 Change-Id: Ieb372e8d7554700d5e8d1e2148ab778094ea3878 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Allow QWebEnginePage::createWindow to return thisJoerg Bornemann2016-07-082-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider a QWebEnginePage subclass that does "return this;" in createWindow. Commit 1f07d2929a made this a no-op to prevent QtWebEngine from crashing. The reason for the crash was access to deleted memory after destroying the current adapter in adoptNewWindow. Defer the adoption in this case to whenever we hit the event loop again. Change-Id: I9674d80ef8b2f301c1446ff505b2486649451ba6 Task-number: QTBUG-42216 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Fix regression in text selectionAllan Sandfeld Jensen2016-07-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | While 'button' should officially be none on mouse move events, the aura and windows events set 'button' on mouse move, and selection code appears to depend on it. Change-Id: I49f84e6f9178c3b2cb0f2c2c8a7b1d30141d0b4e Reviewed-by: Michael Brüning <michael.bruning@qt.io>