summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Never call QtWebEngine::initialize from DllMainCorentin Jabot2015-12-181-2/+12
| | | | | | | | | | | | | | | On windows, calling QtWebEngine::initialize from DllMain may crash, depending on what QPA backend is used. We make sure to only add a qAddPreRoutine initializing QtWebEngine if there is no instance of QCoreApplication. By doing so, we support linking to QtWebEngineWidget from a plugin, while still initializing the WebEngine automatically when linked to the main application binary. Change-Id: I4f72aa10103de29ce53fe3dd88457d093b705599 Task-number: QTBUG-46720 Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* Extend toQImage to automatically deduce the image formatJoerg Bornemann2015-12-172-0/+77
| | | | | | | | We will use this in a subsequent commit. Change-Id: I73af6b28691eea97e076d0619f3068ec8c5324a2 Done-by: Allan Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Move conversion function for keyboard modifiersJoerg Bornemann2015-12-174-24/+71
| | | | | | | | | | Move flagsFromModifiers from render_widget_host_view_qt.cpp to a new file type_conversion.cpp. We will use it in a subsequent commit. Added a separate source file to not include qcoreapplication.h in type_conversion.h. Change-Id: I6dfd54dd99d640ff48cb1a710271c7f8115891e5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add support for checking if audio is played in a page.Alexandru Croitor2015-12-1512-1/+182
| | | | | | | | | | | | | Add support for checking if audio is played in a page, as well as the ability to (un)mute the audio. Modify demobrowser example to show (muted) in the tab title, if the tab is muted, or (audible) if there is audio playing in the tab. Fix HTML5 audio/video (un)mute to also work. Change-Id: I7213645e67be2f9da1c5f96cdf6c7eef5341ae4b Task-number: QTBUG-48788 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add pictograph font family settingAllan Sandfeld Jensen2015-12-115-4/+9
| | | | | | | Use the same default font as Serif since that is what Chromium does. Change-Id: Ie83cf114b516c6a1ae0d78ab768c1713144074ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add web action for saving the current web pageJoerg Bornemann2015-12-1119-0/+218
| | | | | | | | Add the possibility to save web pages as single HTML file, complete HTML (with resource directory) or MHTML archive. Change-Id: Ic7e7cfda9432f3534c13350a6369d79bb17fd8b3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix default settings initializationAllan Sandfeld Jensen2015-12-092-66/+54
| | | | | | | | | | | | We must ensure WebContext is initialized before using global chromium objects like command_line. And clean-up the use of static default tables, both fixing their name, and fix a problem where the default depends on which type of profile was initialized first. Change-Id: Ibd8cbbf00bb2ad6cc1d823023d2a48e10bdf93bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-0337-200/+301
|\ | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * Doc: remove obsolete docs about URL requests and scheme handlerLeena Miettinen2015-12-022-12/+0
| | | | | | | | | | Change-Id: Ic567bcd9ba91d82c1df1ef42f6b57e4209418f22 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Rename setExtraHeader to setHttpHeader in QWebEngineUrlRequestInfo.Michael Bruning2015-12-022-3/+3
| | | | | | | | | | | | | | | | Also make a small update to the documentation of the method. Change-Id: Ie19578ffccfd30c884cdfe882dffcdae6637e8e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Change QWebEngineUrlRequestInterceptor::interceptRequest to void.Michael Bruning2015-12-025-2/+15
| | | | | | | | | | | | | | | | Now uses a flag in QWebEngineUrlRequestInfoPrivate to store if the interceptor actually changed the request. Change-Id: Idccbd1c15696e577ee69248e53b75ba6ec1c571c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Doc: edit QWebEngineCookieStoreClient::FilterRequest docsLeena Miettinen2015-12-021-7/+18
| | | | | | | | | | | | | | | | | | - Add \brief commands. - Each \variable command needs to be in a separate help topic. - Edit the language Change-Id: Iac9b57ceaca5d3decce83305b8d3d39d54eb09dd Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Doc: edit the porting instructionsLeena Miettinen2015-12-021-20/+19
| | | | | | | | | | | | | | | | Follow the Qt documentation guidelines and fix some grammar issues. Change-Id: I1e708a2089b112aa079871b19698f71f0d3e85c3 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Work around MSVC linker out of memory failureJoerg Bornemann2015-12-021-0/+24
| | | | | | | | | | | | | | | | | | | | The native 32 bit MSVC linker tends to fail with LNK1102 (out of memory) in debug mode. Work around this issue by disabling debug information for x86, when not using the amd64_x86 cross-compiler. Task-number: QTBUG-49545 Change-Id: I2aac7e400719f74ced450e264ab1464596e5f204 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Support custom mouse cursorsSzabolcs David2015-12-012-2/+17
| | | | | | | | | | | | Task-number: QTBUG-43009 Change-Id: Ic36554c5137a55d9d4b9143c204d9d4400e23ff8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Add core-private dependency to core_api.proJoerg Bornemann2015-12-011-1/+1
| | | | | | | | | | | | | | | | We want to use private QtCore API in later commits. Change-Id: If006d9bfd503cdb21b3adf164c0ebf2aa8967bac Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Remove superfluous destructor from QWebEngineCookieStorePrivateJoerg Bornemann2015-12-012-6/+0
| | | | | | | | | | | | Change-Id: I449f4c19b256373b78fa4585c14d06dbc8bc7276 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Rename QWebEngineCookieStoreClient to QWebEngineCookieStoreMichal Klocek2015-12-0115-108/+108
| | | | | | | | | | Change-Id: I8f9a4c5c155a65ede24908799218fd867db0767c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Remove the empty virtual destructor from QWebEngineUrlRequestInterceptor.Michael Bruning2015-12-011-3/+0
| | | | | | | | | | Change-Id: Ia7bcdcfd7db7120e6d9e5f46842501ec0f613f18 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Rename url scheme handler's destroyed signalAllan Sandfeld Jensen2015-12-013-5/+7
| | | | | | | | | | | | | | | | Make the signal distinct from the QObject destroyed signal and make sure it is not documented and follows private signal naming. Change-Id: If10a6e7fcee5e9ea4d3ed12ddb8e6ff3f1170adc Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-12-011-0/+18
| |\
| | * Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-271-0/+18
| | |\ | | | | | | | | | | | | Change-Id: Ie1f05c97650ecb86a6fe2d69ad037790c315a83b
| | | * Reassociate the web channel when setting a profile.Michael Bruning2015-11-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WebContentsAdapter gets recreated and the QmlWebChannel needs to be reassociated with the new adapter instance. Change-Id: I88494fd379c429f2ae98df95a22c04c334452088 Task-number: QTBUG-49521 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | | * fix crash on WebEngineNewViewRequest.openInJoerg Bornemann2015-11-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling WebEngineNewViewRequest.openIn with the WebEngineView that initiated the request, QQuickWebEngineViewPrivate::adoptWebContents would destroy the current WebContentsAdapter object. But this WebContentsAdapter implicitly holds the RenderHostViewImpl of the current call stack. Accesses to it after adoptWebContents is finished will crash. Fix the crash by deferred deletion of the current WebContentsAdapter. Task-number: QTBUG-47601 Change-Id: I3c229172511b4aed77632a0abefbe0265ebf1557 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Update QtWebEngine version in module overviewKai Koehne2015-12-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove QtQuick import. This one is not specific for the module. Change-Id: I0cdbb0f36823e109e0b4b93e65ae3de59aebd2b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | | Fix loading of Flash plugin on WindowsKai Koehne2015-12-011-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far we were only storing the filenames, not the full paths. While at it also fix the loading on 32 bit Windows, and do not hardcode the location of the Windows directory. Change-Id: Ie5d9a23b941ff9bde36e687c37c412b15b4d65c8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Configure gyp for arm64Allan Sandfeld Jensen2015-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces basic support for doing native arm64 builds. Change-Id: Ic03327c053a1c8197ba0610cf1364ccc93f015ff Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Doc: Adobe Flash player plugin supportLeena Miettinen2015-12-011-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-49625 Change-Id: I2b01f45d0b8082a13eff4a4629de13fa8da862aa Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | | Doc: remove include and linking instructions from front pageLeena Miettinen2015-12-013-25/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the instructions are visible on the linked page for each module. Change-Id: I47625bd8eb19ddf1f94e1bafb49f132216a0c069 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | | Doc: document QWebEngineHistoryItem::swap methodLeena Miettinen2015-12-011-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8c6e4d9887d5169037e580db8a91c102009df5e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | | Doc: make docs for QWebEnginePage::requestedUrl clearerLeena Miettinen2015-12-011-2/+4
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-49500 Change-Id: Ibeafae52ae523a526c912ef3e40f6d69da7b13bd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Kati Kankaanpaa <kati.kankaanpaa@theqtcompany.com>
| * | Force creation of default WebEngineProfileKai Koehne2015-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the default QWebEngineProfile is created first. This creates the default WebEngineContext, which in turn initializes global things like AtExitManager. Task-number: QTBUG-49557 Change-Id: I9e8f6bd24edd7f4c7e8bb38d91a2c09631824828 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-202-1/+3
| |\| | | | | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| | * Fix loading user scripts from qrc filesJocelyn Turcotte2015-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QUrl::toLocalFile doesn't handle qrc:// URLs, do like QQuickImageBase instead and use a public utility function to does that conversion. This allows loading qtwebchannel.js and use it in subsequent user scripts. Change-Id: I4791abdc96a7cd1e65ff76b1adeab9f9b250b582 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * Let new pages use the custom user agent settingKai Koehne2015-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The default is UA_OVERRIDE_INHERIT, which means that it will only use the override value if there's a previous NavigationEntry. Task-number: QTBUG-48891 Change-Id: Id5269b5ad2a4b0a78379c2b7df3c3e901cd2a485 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add WebGL, WebAudio and Accelerated2dCanvas settingsAllan Sandfeld Jensen2015-12-027-2/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These settings were in QtWebKit and are easily added in QtWebEngine. Without the preferences the same could be achieved using command line flags. The defaults are calculated to match what is set in RenderViewHostImpl. Change-Id: I0c80507574ebc3898fc409e47194246fb00abc75 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Doc: add docs for QWebEnginePage::WebAction::Unselect enum itemLeena Miettinen2015-12-021-0/+1
| | | | | | | | | | | | | | | Change-Id: I49ccb37a92795267f2ec16c025cf3a915af384a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add support for html color inputAdam Kallai2015-12-0217-0/+502
| | | | | | | | | | | | | | | Change-Id: I501125631946f70aae1ff039b0e5bcb9198e7242 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Doc: QWebEnginePage::scrollPosition and contentsSize as propertiesLeena Miettinen2015-12-011-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | QDoc automatically generates documentation for the access functions and notifier signals. Change-Id: Ic9b9ef54acfdac1b3e8ce6c65e89657b2fe3d5ff Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Update Chromium 47.0.2536.71Allan Sandfeld Jensen2015-12-011-0/+0
| | | | | | | | | | | | | | | | | | | | | Including a few missing spellcheck files. Change-Id: Idffb0f5bc4411764c4079a314b21e656f8e892e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-2077-324/+876
|\| | | | | | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * | Fix crash in PermissionManagerQtJoerg Bornemann2015-11-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::vector::erase invalidates the end() iterator. We must not cache end(). This fixes crashes of tst_qwebenginepage::geolocationRequestJS on Windows. Change-Id: Ie2c28c413947bb9ee6580625e07b9d3099d69b06 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | use Q_ENUM instead of Q_ENUMSJoerg Bornemann2015-11-166-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | This makes the enum values available as strings in qDebug, QCOMPARE and such. Change-Id: Id57a2002451337fcc8aedac673f834445913895c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Make QWebEngineFullScreenRequest const correctKai Koehne2015-11-124-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let QWebEngineFullScreenRequest be logically const-correct. It feels weird to be allowed to call "accept()" or "reject()" on a constant object. Also allow the user to copy the request, but check whether the page is still valid in the implementations of accept(), reject(). Change-Id: Ibf139a126734fc8e2db68ec26dc8f24cd4438942 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix resetting attributes in top level WebEngineSettingsSzabolcs David2015-11-122-48/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store default values in separate containers and remove related FIXMEs from WebEngineSettings. Add API test case in order to demonstrate the bug. Change-Id: If9d98265cab0f41b543fe690d534879b65f2b577 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | [Docs] Add clarification on differences between Chromium and Google Chrome.Michael Brüning2015-11-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes link to the upstream documentation that lives in the Chromium source tree. Change-Id: I7a4e061437547d554f004e8db3cec60c5c0d0800 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | rework QML authentication dialogJoerg Bornemann2015-11-091-30/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve AuthenticationDialog.qml in the following ways: - Make all user-visible strings translatable. - Make the dialog a Window instead of an ApplicationWindow, because we don't need status bar or tool bar support. - Do not mix layouts and anchors. - Do not hard-code the dialog's size. - Longer strings in the message label are now actually visible. - Pressing enter in input fields accepts the dialog. - Remove calls to destroy() that would not destroy the dialog but the Button items. Task-number: QTBUG-49244 Change-Id: I490d30aeea740d436e060aa2b5f5bf288603b8f2 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | fix translations in UIDelegatesManagerJoerg Bornemann2015-11-092-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Declare UIDelegatesManager::tr and harmonize translations in that class. Change-Id: I6dfdb29b24d8912150d0af637b8dc1af633e21df Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * | find high accuracy geo position source if requestedJoerg Bornemann2015-11-091-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a high accuracy geo position source is requested, iterate through all available sources and return one that supports satellite positioning methods. Change-Id: I0c76bb8f8a6502b62e3a2e012327babbab2715ad Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Apply glib usage from the Qt configuration to QtWebEngine as well.Michael Bruning2015-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was previously ignored and libQt5WebEngineCore.so.5 still linked dynamically to libglib-2.0.so Change-Id: I0b0b128c9eb36d94af9f5f91f212d1371403adad Task-number: QTBUG-49253 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:13:04 +0000