summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-204-11/+26
|\| | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| * Build ninja in the shadow build directory.Michael Bruning2015-11-191-9/+22
| | | | | | | | | | | | | | | | | | Essentially makes a copy of the ninja sources to the build directory to be non-intrusive for src/3rdparty. Task-number: QTBUG-44002 Change-Id: I82a686abbfab2579462dcb57e10b16f71a3a0d4e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * 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>
| * fix "open download" in demo browserJoerg Bornemann2015-11-181-1/+1
| | | | | | | | | | | | | | | | Open the downloaded file, not the directory. Change-Id: I61b3a8e6788bf26b1a446459ce8b38774f8c28a0 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * 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>
* | 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>
* | Add 'markdowneditor' exampleKai Koehne2015-11-1719-1/+1595
| | | | | | | | | | | | | | | | | | | | | | | | | | This example shows the use of QWebEngineView in a hybrid application, and how one can leverage JavaScript libraries to provide functionality with minimal effort. QWebEngineView is used to preview a MarkDown document. The text is exposed to the view through QWebChannel. An off-the-self js library converts it to HTML. Change-Id: I24c38106da3ec18975c71c16f7f7a58e93142f9e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update DemoBrowser example imageKai Koehne2015-11-161-0/+0
| | | | | | | | | | Change-Id: I8eaf44ed98bbceac06bae9751cee1490d553db7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | use Q_ENUM instead of Q_ENUMSJoerg Bornemann2015-11-167-17/+17
| | | | | | | | | | | | | | | | 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-127-25/+35
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | stabilize tst_QWebEngineScript::injectionPointJoerg Bornemann2015-11-121-4/+4
| | | | | | | | | | | | | | | | Use QTRY_COMPARE instead of a hard-coded timeout. Fix usage of setTimeout in DOMContentLoaded event listener. Change-Id: I915ea0d2c54cf45be42803963d03b19c15135fd4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix resetting attributes in top level WebEngineSettingsSzabolcs David2015-11-125-48/+140
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix cross-compile with NSS availableAllan Sandfeld Jensen2015-11-111-3/+4
| | | | | | | | | | | | | | | | Chromium currently can't build configure with both NSS and embedded, so we need to use OpenSSL in that configuration. Change-Id: Ia680b2865d876d4dcd4df8624b8628ff579fc649 Reviewed-by: Kai Koehne <kai.koehne@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>
* | Fix multiple symbol definition error with gold linker.Michael Bruning2015-11-061-2/+0
| | | | | | | | | | | | | | We should not need to include the moc'ed sources here anymore. Change-Id: I2417e71aac9495e6f85653c7636be882b02e8a74 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | add dummy positioning pluginJoerg Bornemann2015-11-065-0/+147
| | | | | | | | | | | | | | | | | | | | | | The QtPositioning plugin loader only loads plugins that are marked as testable whenever it detects that a Qt autotest is running. We now provide our own very simple positioning plugin that always provides the same location: the western beacon of port entrance Warnemünde. Change-Id: I747188dc261ba47c10056ad50754bb686e75c783 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | remove "CONFIG += ordered" where applicableJoerg Bornemann2015-11-062-4/+0
| | | | | | | | | | | | | | We will specify proper dependencies when they are needed. Change-Id: Ic62d891dcf3ee97fd98788e848c9ac7c69922282 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add documentation about console loggingKai Koehne2015-11-065-3/+28
| | | | | | | | | | Change-Id: I50ae0beb54f70c232eed0d9bd47b0dc01dadc130 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Print JS console messages by defaultKai Koehne2015-11-067-42/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of QWebEnginePage/WebEngineView to print JavaScript console.warn and console.error messages by default in a 'js' logging category. This matches also the behavior for QtQml, where console messages end up in a 'qml' logging category by default. So far access to the JavaScript console required either use of the remote debugging functionality, subclassing of QWebEnginePage, or implementing a custom handler. Anyhow, even then writing a seamless forwarding of the data and metadata to the Qt message handler is difficult. This patches implements this forwarding by default. The behavior can be changed by either setting up rules for the 'js' category, e.g. setFilterRules("js.*=false"); or by implementing onJavaScriptConsoleMessage(), or overriding QWebEnginePage::javaScriptConsoleMessage. [ChangeLog] Unhandled JS console messages are now forwarded to to the Qt message handler inside a 'js' category. Change-Id: I5480383a80dcf7a122496f9b7915264ef9036db3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Ensure WebContents::WasShown/WasHidden are calledAllan Sandfeld Jensen2015-11-066-2/+41
| | | | | | | | | | | | | | | | | | Forward WebEngineView visibility to WebContents visibility, and call WebContentsView visibiliy on actual show/hide events to avoid a recursion when WebContents visbility triggers it. Change-Id: I0c336359fb35bf93874aa1092767177d7a5ce341 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Replace QList with QVectorKai Koehne2015-11-067-12/+11
| | | | | | | | | | | | | | | | Replace QList with QVector in all places where the type isn't a pointer, and is not already (indirectly) exposed through public API. Change-Id: I90e3db56bf9ebda6b3cb8fb4396d2ae283159727 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use relative paths instead of absoluteAllan Sandfeld Jensen2015-11-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | Ninja will build to source-directory when using absolute paths, to get it to build to build-directory we need to use relative paths. Fortunately we can use the DEPTH variable to get relative path to the chromium src dir. Change-Id: I6b97ef20f2800721cfc399b6f9b6621f5656f7ee Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Improve documentation for QWebEngineScriptKai Koehne2015-11-054-4/+18
| | | | | | | | | | Change-Id: I9274a3cacaa04529152a5d827c47cf6fc831df19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge "Merge branch '5.5' into 5.6" into refs/staging/5.6Allan Sandfeld Jensen2015-11-053-4/+21
|\ \
| * | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-11-043-4/+21
| |\| | | | | | | | | | Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
| | * Fix build on WindowsAllan Sandfeld Jensen2015-11-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | We can't delete a scoped_refptr, but just returning should cause it to do so automatically. Change-Id: I7d7ba28d0264506d608f64847cbfb8a7cb63cf5e Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| | * adoptWebContents: re-bind user scripts with new adapterChristophe Chapuis2015-11-021-0/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48984 Change-Id: I87cb224899458ba8f2d0343ed98932cfc8a6947f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * fix frequent deadlocks on WindowsJoerg Bornemann2015-10-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a desktop OpenGL build of Qt we encountered frequent deadlocks when creating OpenGL contexts. Initialize the context directly on the calling thread instead of the browser thread and do not synchronize with the browser thread. Task-number: QTBUG-48276 Change-Id: I0970c66cb230881cdc53f22d4a255ea08e6fe63a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Do not use system harfbuzz unless it is configured.Michael Bruning2015-10-302-0/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I8d2aca1d3192be08295af57b08489bfefc8e0dc4 Task-number: QTBUG-49128 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Do not display context menu when pending event flag is false.Michael Bruning2015-10-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an event filter is installed on the view, the right mouse click event may trigger Chromium to request a context menu even though the context menu events get filtered out. Removes a Q_ASSERT that would now never be triggered. Change-Id: I3ff496ec4e4ecbb4faa107f7e221765918c5fa06 Task-number: QTBUG-49092 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * adoptWebContents: re-associate webchannel with new adapterChristophe Chapuis2015-10-281-0/+10
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48984 Change-Id: Ief41fe9619f4300d7a0c25a57f09f5eefe3fca3d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Update devtools discovery pageAllan Sandfeld Jensen2015-11-051-37/+69
| | | | | | | | | | | | | | | | | | | | | | | | Update the page to follow recent versions of Chromium's, now renders both title and URL for items. Change-Id: I0bc6dd4c2e4078bf9197d0f0af67747728bf6e8e Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | [Windows] Fix build on 32 bit hosts.Michael Bruning2015-11-041-0/+5
|/ / | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Change-Id: If313188cdcc4634c3c9bf9dad6d2dce229fa3faa Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Properly mark value based classesKai Koehne2015-11-026-2/+27
| | | | | | | | | | | | | | Change-Id: I937ce0daf2fa73d7179a5f62585abfb1acea7264 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Fullscreen notification popup for Widgets demobrowserSzabolcs David2015-10-305-3/+208
| | | | | | | | | | Change-Id: I3afc0399e4156cd17917103face68ca1945409f9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Revert "Remove rpath workaround from QtWebProcess build."Michael Bruning2015-10-301-1/+16
| | | | | | | | | | | | | | | | | | | | | | It does not work properly with the new rpath logic and causes problems with the installer packages. This should be a temporary fix until the rpath situation has been cleaned up again. This reverts commit 819279827a4ce05562909994468ec5604392c672. Change-Id: I082ba0118d410f90d202c786d07717bf224d5f70 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | enable tests/auto/coreJoerg Bornemann2015-10-303-4/+3
| | | | | | | | | | | | | | | | Enable autotests and blacklist tests that are known to fail. Add skips and waits and mark them with the corresponding task numbers. Change-Id: I993e366ba3b07239a8ba15eae2ee8e3e2aaa8308 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Use consistent naming of Qt-specific Chromium classesAllan Sandfeld Jensen2015-10-2912-73/+74
| | | | | | | | | | | | | | | | | | Most of our Qt specific versions of Chromium classes have Qt appended, but a few observers have it prepended. This patch renames them to keep naming consistent. Change-Id: I004b61e16bc47f39a6bbc16a5f5c10585626865c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Fix a typo in quicknanobrowserSzabolcs David2015-10-281-1/+1
| | | | | | | | | | Change-Id: I90082e7b95f1693d107a4655324d5544b2d5d29e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Update Chromium SHA1Allan Sandfeld Jensen2015-10-282-1/+1
| | | | | | | | | | | | | | Pulls in the lastest 45-based SHA1 Change-Id: I7111143db7697cfa3861ba26255102717d1d39e2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Joerg Bornemann2015-10-2810-9/+305
|\ \
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-2810-9/+305
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
| | * Fix touch events coordinates when using custom devicePixelRatioChristophe Chapuis2015-10-271-5/+7
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-48766 Change-Id: Idcae6dc84829fe96db62c6cb30ab193873d36709 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 13:42:28 +0000