| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I1644a08d8d19841cb66762af42a766fc4d1518ef
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change-Id: Idfb37cd43929536d4c67d1fa5d8cb598e9c0ad7e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I66add69e6d08b74111ec8e7e4401e4d813501206
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I3d4c1bf98fe1d1aaad868f4a6210f241aa43a2eb
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: Iccd335ea312d91e826885857fee6d0da3e913b8c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
| |
Change-Id: I7e96b8e5ba5eef9b0c6c0835e200f770200573ed
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I8886595114569f61168aed76b23ad7288c5cb34c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: Ib6549e44a04300c7b7b07ddc9094b823b37f3183
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: Iccbb1e8bd8b7f72322614224c203fc509a8dbb79
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I9f66467721cf923468af87915c260c1bb44e013e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
|
|
|
|
| |
Change-Id: If41869580556fbe9b79fa9c3b162cefb23c74d25
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
| |
Make the necessary changes to compile with the recent changes made to
QSGRenderNode in qtdeclarative/28f8795d716035516f03542cd55275375462fdc5
Change-Id: Icc2b70db6913cc7a51480ed9c556999aa8874472
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|
|
|
|
|
|
|
| |
Added missing underscore before last h character. File should not be
included more than once now.
Change-Id: I1bb9e440de19fa0c243c923ed0a6fcb3b30e7997
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
It is similar to QWebSettings::LinksIncludedInFocusChain attribute from
widgets API.
Change-Id: Ie5a38bc7372657fee5c50ab91bc1eb7e8e1d3524
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
This is similar to QWebSettings::setUserStyleSheetUrl() from widgets API,
and shares most of helper code with existing userScripts property.
Change-Id: I9352e6b4338c5750ed2ea28efbb2aba045cf7847
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Includes partial cherry-pick of patch by Danilo Cesar Lemes de Paula
https://bugs.webkit.org/show_bug.cgi?id=114298.
Change-Id: Iff3ee6de9d318d41f20f949b31c20a15dd0cac17
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ib63865b4205ffc6bb8dbfb1f8c8e607cc29c1364
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
|
|\
| |
| |
| | |
Change-Id: Ideed7a2c21b448633c32f690918eb1ae40355819
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We need to set both setDrawsTransparentBackground and setDrawsBackground
to get the full correct behavior of transparent backgrounds.
Task-number: QTBUG-40063
Change-Id: Iaa276a6a12e3cff40d8bc2892fb0667242afb88b
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
- Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21
Change-Id: Ic5dc1e41d623e73068faf3683dd8e8c3a0ae8864
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
WebView.experimental gets a new webChannel property. By default, this
is initialized to a QQmlWebChannel internal to the WebView. By setting
it from the outside, it is possible to share the same WebChannel
between different WebViews. The webChannel property can be set to null
to disable this new feature.
For IPC, a navigator.qtWebChannelTransport property is added, which is
essentially a copy of navigator.qt. This is required to be able to use
both independently. The transport is implicitly connected to the
WebView's webChannel.
On the JavaScript client side, some manual boiler plate code is still
required. Potentially, this can be adapted in the future to preload
the qwebchannel.js. Furthermore, we might be able to instantiate and
initialize the QWebChannel before we emit window.onload.
A basic test is added which verifies that this basic integration works.
Change-Id: I5eb0389e6edd6d0c978917e441365e11a02b5c3f
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Moved the description from the overview page
to the WebView type documentation. Also added an
image corresponding to the snippet used.
Task-number: QTBUG-36179
Change-Id: Iaf4207a36f774d93af9a881eae2162d44837eeee
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The fact that the html string will be implicitly converted to UTF-16
led to some errors with loaded resources.
Task-number: QTBUG-36656
Change-Id: I6ed36e2e814034cfccb4082c24e3327674e04cdf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Qt for Embedded Linux Requirements isn't available since Qt5
- NOTIFY signal documentations are now ignored and are part of their property
- The QtQuick1 WebView code isn't available anymore
- Adjust to other renamed and removed pages
Change-Id: Ife04becb1a847fb0bfb11dfafa6db2caa36aa9f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
| |
Implements setting the platform cursor in QtPageClient.
Task-number: QTBUG-36368
Change-Id: I0ec2dc5eae550a7fa1197587f85c3f84b3225240
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
|
| |
The conversion from uint64_t to QFlags is now ambiguous, but since
we need an int QVariant in the end anyway, we can cast directly to that.
Change-Id: I4478efa2b293a59b47c46d27346b56eab48b3278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reapplies commit 0b789c6a785d5ef45c3f6f2fc0f8694772b3d392,
which had been in Qt 5.0.x and 5.1.x, but was not upstreamed
and hence overwritten when importing the new snapshot.
This basically reverts http://trac.webkit.org/changeset/136119.
Task-number: QTBUG-35097
Change-Id: I3e02c3feeb5193c0c06b7525469e208de1d6cafc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Replace obsolete 'Page' QML type used in the sample code
with 'ScrollView' from Qt Quick Controls.
Task-number: QTBUG-35154
Change-Id: I0a16a6158be028bf8a7975240411841c4e8200ef
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
|
| |
It was using and for two different error codes as David
Binderman pointed out.
Task-number: QTBUG-39425
Change-Id: I85348d8ba07757eb33eceb447adb34cc2e4e1842
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To support Windows XP we must avoid using the 64bit variants of the
atomicIncrement/atomicDecrement operations which are only supported from
Windows 2003 and up.
This patch rolls back the minimum Win32 API version to WinNT 5.1 (32bit WinXP),
and adds a new flag to indicate the support of 64bit atomics.
The new flag is now also used to support MIPS and other architectures
without 64bit intrinsics, instead of hacking in poor support.
This also extends the atomic operations to sparc64 which was previously
skipped because it did not work with __exchange_and_add.
Task-number: QTBUG-34271
Change-Id: I21b09df3cafb7f0987a2f44c89036ff34ed34aa0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reverts the removal of Android support in WTF, and brings the support
up to date.
Merged change to MacroAssemblerARM.cpp from QtScript.
Replaces use of statvfs with statfs in one place.
Replaces shm-based shared memory with ashmem-based in WebKit2.
Change-Id: I440b1fbd94bb4148f7ba764d77de65230d13ed90
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
The localStorageDirectory is set right after the WebContext is created,
but during creation the path is empty and will cause a warning in QDir.
Task-number: QTBUG-33866
Change-Id: I940e08c217ee2401e326bf60910bc628add2f30b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
| |
-qtwebkit-index.html and "Qt WebKit" are the correct names for the
module according to the writing guidelines
-index.html will collide with the main Qt 5 index.html page
Change-Id: Ic07ae422b85766090b1e3c09b34100293a972bfb
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=121089
Reviewed by Simon Hausmann.
.:
QtLocation -> QtPositioning
* Source/sync.profile:
Source/WebKit:
QtLocation -> QtPositioning
* WebKit1.pri:
Source/WebKit/qt:
QtLocation -> QtPositioning
* WebCoreSupport/GeolocationClientQt.cpp:
Source/WebKit2:
QtLocation -> QtPositioning
* Target.pri:
* UIProcess/qt/WebGeolocationProviderQt.cpp:
* WebKit2.pri:
Tools:
QtLocation -> QtPositioning. Make sure we set build type before doing configure checks
that might depend on them.
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/features.prf:
Change-Id: I96a16559373a21513c4d83e53b6cee9f27682649
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156395 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
| |
Removes all use of C++11 specific features in WebKit2. This consists of
template<S<T>> syntax, a few uses of auto, and a single use of std::move.
Change-Id: I1bbd356c430802caf5f7440cd0d3bb2ba49ed098
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
| |
One forward declaration of QUrl was missing proper namespace macros.
Change-Id: Ibb2414b63e2926015874b4cf7024f101d59be6dc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
|
| |
Nullptr is one of the C++11 features not fully supported in gcc 4.4,
we can therefore not rely on it being converted to a pointer automatically.
Change-Id: I91830a2e78d9eb7532930581774cc095181cbf83
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
|
| |
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Change-Id: Iaa6209d0d611d18b8c916bcd165c8bf5b7441b7b
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
https://bugs.webkit.org/show_bug.cgi?id=108808
When the QtWebProcess crashes, the registered URL Scheme
Delegates are not properly restored over IPC in the newly
launched process instance.
Reviewed by Simon Hausmann.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::didRelaunchProcess):
(QQuickWebViewPrivate::updateSchemeDelegates):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):
Change-Id: I14493ea1190053e5a523d2cf8a99cc8d526b4fd2
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142997 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
https://bugs.webkit.org/show_bug.cgi?id=108474
Forward the processDidCrash, didRelaunchProcess, processDidBecomeUnresponsive
and processDidBecomeResponsive signals to QML's WebView.experimental.
Reviewed by Jocelyn Turcotte.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::processDidCrash):
(QQuickWebViewPrivate::didRelaunchProcess):
(QQuickWebViewPrivate::processDidBecomeUnresponsive):
(QQuickWebViewPrivate::processDidBecomeResponsive):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewPrivate):
NOTE: This is the initial iteration of the patch attached to upstream
bug report 108474, i.e.:
https://bug-108474-attachments.webkit.org/attachment.cgi?id=185771
The actually committed version is incompatible with the status of
QtWebKit stable as the architecture changed too much.
Change-Id: I91d28dde2774fd1487a96ac36a14b522ffb7756c
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|