summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Make AccessiblityActivationObserver separate of RWHVAllan Sandfeld Jensen2019-01-097-44/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a global control anyway, and with future Chromium headers, there are conflicts with qaccessibility.h. Change-Id: Ife43340684b8b9498b1f4cd3f6fbe450d88794ec Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | | | Test: port tests to QRegularExpressionSamuel Gaist2019-01-094-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the tests to use QRegularExpression in place of QRegExp which is to be considered deprecated. Fixes: QTBUG-72596 Change-Id: Idebd9595b60d653974aa6ac49a75e2f90fea184f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | | Docs: Correct documentation of QWebEnginePage::print()Szabolcs David2019-01-071-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-68561 Change-Id: I4284725bc64f78dc4df39d88885d6a463c8efa62 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.12' into dev" into ↵Allan Sandfeld Jensen2018-12-1929-74/+550
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | refs/staging/dev
| * | | | | Merge remote-tracking branch 'origin/5.12' into devMichael Brüning2018-12-1829-74/+550
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/compositor/delegated_frame_node.cpp src/core/profile_adapter.cpp src/core/profile_io_data_qt.cpp src/webengine/api/qquickwebengineprofile.cpp src/webenginewidgets/api/qwebengineprofile.cpp Change-Id: I35ec8480e758bbcb6c5942a5401cb1b6dbdcc428
| | * | | | Doc: Fix a broken link to macOS requirementsLeena Miettinen2018-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs we restructured for 5.12. Change-Id: I0b879bc9fb085d5743a16bc89d405e11f22ca66c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * | | | Doc: Add full stop to the end of brief statementLeena Miettinen2018-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get rid of a QDoc warning. Change-Id: Ib5d25edcf3b7e4a9786dd2056b025757ed5f7beb Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | | | Document and safeguard usage of custom schemesAlexandru Croitor2018-12-124-6/+60
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change improves the documentation of QWebEngineUrlSchemeHandler to notify the requirement of registering a custom scheme before installing a custom scheme handler. Also start showing warnings when QWebEngineProfile::installUrlSchemeHandler() is called before a scheme is registered. Also show warnings when installing the handler using QML. Task-number: QTBUG-72079 Change-Id: If249592ea43fe2f9ad587a6ff4e8c9dedcc5d3d3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * | / use new feature name xkbcommon_evdev -> xkbcommonGatis Paeglis2018-12-111-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xkbcommon configure logic was refactored in qtbase/c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a. For more details see the relevant commit. Fixes: QTBUG-72448 Change-Id: I04a5c7f7d0d64eb6a278560f439a585fba259cb4 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Disable external text handles and edit menuPeter Varga2018-12-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium implements its own ones and we don't want to conflict with them. This disables the QtVirtualKeyboard's selection handle what is not functional with QtWebEngine. Task-number: QTBUG-59999 Change-Id: I6a615a04d5eac1ce2d0392d63ba0fc9039583914 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Disable text prediction for inputPeter Varga2018-12-073-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround to avoid issues with QtVirtualKeyboard when used with QtWebEngine. Task-number: QTBUG-70158 Task-number: QTBUG-71995 Change-Id: I1e6fcd4dceb131dbe781dd7ab3856cb154ac6a18 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-1/+1
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ib9d391c432e6f7841c9dbc94529b9fb6989b3a00
| | | * | Fix misleading information in changesv5.12.0-rc2v5.12.0Allan Sandfeld Jensen2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b940140bbbb132e4b4524ac0b205551750a9585 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | | * | Reinstate skipping content/browser for jumbo-buildsv5.12.0-rc1Allan Sandfeld Jensen2018-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are hitting OOM crashes on the CIs again. Task-number: QTBUG-71870 Change-Id: Ief97b83b26091136acf4988e555b331191ce8271 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 24d883d703d3599d6818b6b371ae06dd4ca6f734) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | | Fix missing TransportSecurityPersisterMichal Klocek2018-12-042-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit d603b7055 introduced TrasnsportSecurityPersister, however it did not survive merge form 5.11 to 5.12. Task-number: QTBUG-69605 Change-Id: I6357af25afcfd5c08aae77695bd2131f1cef6b71 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * | | Blacklist failing tst_QQuickWebEngineView tests in openSUSE 15.0Tony Sarajärvi2018-12-042-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time we blacklist in the right directory Task-number: QTBUG-71461 Change-Id: If60b128f485b6d1810d759c44275555a5a422525 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Fix xscrnsaver detectionAllan Sandfeld Jensen2018-12-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Ozone use_xscrnsaver defaults to false, so reverse when we set it. Change-Id: I6950f68a693092bf9315e3d8202347adac3c4742 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | | Update ChromiumAllan Sandfeld Jensen2018-12-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: e67f78ca38 Fix building skcms with intel cc 085b0fd918 Fix compiling zlib without thumb 782b63902d Fix idle detection with X11 Ozone d2f5d6869f Add net::URLRequest::first_party_url() dbafb145af FIXUP: Pass virtual url of data url request back to the UI f98eb4915b Fix bogus check for thumb in zlib bee1c29f64 [Backport] Fix of CVE-2018-17479 (1/2) f365fecfa8 [Backport] Fix of CVE-2018-17479 (2/2) e99d664a35 FIXUP: Switch to use glx over ozone 323b45aa24 FIXUP: Pass virtual url of data url request back to the UI Change-Id: Ic0c5f6fa3e0792032f1c288470bc7f1df1cc15d6 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * | | Reinstate GetQtXDisplayAllan Sandfeld Jensen2018-11-292-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is needed by the X11-services with no working Ozone equivalent for runtime detection of X11. Change-Id: Iac79b5e29b9a8ef92af35209f3df40eb91c738f7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | | Enable bilinear filtering for software texturesAllan Sandfeld Jensen2018-11-291-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently these will always have a filter value of 0 from Chromium. However fixing it exposes another bug that looks worse, so depend on that being fixed in 5.12.1. Change-Id: I3481a8cc5fa9fb98ae597905d22973ec411a1134 Fixes: QTBUG-71322 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * | | Avoid binding loops caused by default context menuSzabolcs David2018-11-292-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a WebEngineAction is tied to a UI element and a context menu request modifies its enabled state, the users get a warning: 'Binding loop detected for property "enabled"' Avoid triggering the action's notifier signal when the default context menu is being built. Change-Id: Ie23087f0b879399cf1cb88c44a42cd0be537a750 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Fix input method updatePeter Varga2018-11-297-26/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do the update after the input properties are changed in RenderWidgetHostViewQt. Moreover, always update on input state changes, like cursor position, surrounding text and text selection (see QInputMethod::update() docs). Task-number: QTBUG-70158 Task-number: QTBUG-71995 Change-Id: I9d5c6e299826fbe66f5285b648013ef79aabed9b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Docs: Extend documentation of WebActionsSzabolcs David2018-11-283-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some useful information. Change-Id: I39290c8dfc6c4a1d87c6b24fe6c48cab93f805db Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Doc: Add docs for useForGlobalCertificateVerificationLeena Miettinen2018-12-141-26/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move information from the getter and setter docs here, and remove them. Change-Id: Idb68a4e691cd46faebec9f55bf17bbf1591f4766 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Move printing operation to a new threadSzabolcs David2018-12-1011-109/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing operations were blocking the UI thread, so applications were irresponsive when printing in large size or high resolution. Introduce a new worker for the painting logic and use shared pointers to carry the data around and avoid copying PDF data between threads. Task-number: QTBUG-68561 Change-Id: I30633380b75acd14f1a1df87985c99540168a9f1 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Fix recursion in WebEngineContext constructorMichal Klocek2018-12-042-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gpu process startup needs sync point manager and it can ask for current web engine context, while is being created. Moreover this call will take place from GPU thread, so it leads to race condition. Done-With: Kirill Burtsev<kirill.burtsev@qt.io> Fixes: QTBUG-72113 Change-Id: I43bf37da0cf28ccb5c5cee0d82ed541053016e2e Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-11-2812-29/+150
|\| | | | | | | | | | | | | | | Change-Id: Idf2c89bebf5e09855d764808cac487bc4b76faaa
| * | | Document client certificate featureAllan Sandfeld Jensen2018-11-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id47a763642003f6056f1591e8ba7f82e255cd43e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * | | Fix use-after-free in URLRequestCustomJobProxy::replyJüri Valdmann2018-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following operations are executing concurrently on the UI & IO threads: 1. UI thread executes QWebEngineUrlRequestJob::reply --> PostTask(IO, URLRequestCustomJobProxy::reply). IO thread executes URLRequestCustomJob::Kill --> PostTask(UI, URLRequestCustomJobProxy::release). 2. UI thread executes URLRequestCustomJobProxy::release, then deletes the QWebEngineUrlRequestJob and the QIODevice. IO thread executes URLRequestCustomJobProxy::reply and tries to use the QIODevice. Depending on scheduling, the IO thread will try to use the QIODevice after it has been deleted on the UI thread. Change-Id: I7a9793a7492a493e1787e7ee6d0058c0d1aa00ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | | Fix IME with negative start positionPeter Varga2018-11-222-8/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: I64a39975788cc40c5e0595c1a0c5db9000889bfd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Fix emulated touch eventsAllan Sandfeld Jensen2018-11-222-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Touch events now does hit-testing based on surface, so we need to register outselves as a surface to have touch events do anything. Fixes: QTBUG-71801 Change-Id: Iafd43dfcecf029f9c11e0c0c58a349ff38badbaa Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Add check for thumb instruction setMichal Klocek2018-11-213-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently require thumb instruction set on arm to build internal ffmpeg. Task-number: QTBUG-71772 Change-Id: I43ed152a51f0dea97b800c868eb13a4e5e8e077e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Fix running thumb vs arm instruction set on yoctoMichal Klocek2018-11-212-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On yocto CC/CXX export contains flags like -marm, -mthumb see https://lists.yoctoproject.org/pipermail/poky/2018-September/011497.html Fix builds for webengine and check also QMAKE_CC for flags, otherwise build ends up passing -marm and -mthumb flags at the same time. Change-Id: I76feb0eaf3bed8a6c3552db1bbf1a0809f03110a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Remove bogus line from configure.jsonMichal Klocek2018-11-211-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I83a7a38d574b353e7748a71d83183b75f6dc7c1a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Init the idle monitor on macOSAllan Sandfeld Jensen2018-11-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As the only platform macOS needs it initialized manually Change-Id: I922aea7e9f19abac6c1b46822d48646d68784014 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Clean-up coding style in content_utility_client_qtAllan Sandfeld Jensen2018-11-162-16/+22
| | | | | | | | | | | | | | | | | | | | Change-Id: I619874b4c90bc5f5d57c68c8a106ab686702ff12 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Fix GL context tracking when running in GPU-on-UI modeJüri Valdmann2018-11-271-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both Qt and Chromium keep track of the current GL context by using thread-local variables, and naturally they are completely unaware of each other. As a result, when a QOpenGLContext is made current, the previous gl::GLContext is not released, and vice-versa. This is fine as long as each thread uses exclusively either Qt or Chromium GL bindings, which is usually the case. The only exception is when the GL driver is considered thread-unsafe (QOpenGLContext::supportsThreadedOpenGL() is false), in which case we have to run all GL operations, including Chromium's GPU service, on the UI thread. Now the bindings are being mixed and both Qt and Chromium get quite confused regarding the current state of the surface. To get this to work we have to release the current QOpenGLContext before executing any tasks from Chromium's GPU service and the gl::GLContext afterwards. Since GPU service just posts tasks to the UI thread task runner, we'll have to instrument the entire UI thread message pump. Fixes: QTBUG-72017 Change-Id: Ibd72e3041d213217fd097dfb4272e49243e31e67 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Delete QtWebKit tests from tst_qwebenginepage.cppJüri Valdmann2018-11-261-1318/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | File is too big. Change-Id: I719be3d4d467712f17fd7c140fd68c416d1c8eb1 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Implement ContentGpuClient for WebEngineAllan Sandfeld Jensen2018-11-2410-22/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the way we are supposed to share a sync point manager with the content layer. Change-Id: I595caa863f8b9c8b4f4bc17df76211416a027a12 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Remove incorrect DCHECK in CompositorResourceTracker::commitResourcesJüri Valdmann2018-11-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-71869 Change-Id: I3e2d39eb6c3559f2a31c6b98f5f950183f2381d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Merge "Merge branch '5.12' into dev" into refs/staging/devAllan Sandfeld Jensen2018-11-1649-69/+329
|\ \ \ \
| * | | | Merge branch '5.12' into devAllan Sandfeld Jensen2018-11-1649-69/+329
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/compositor/compositor.cpp src/core/compositor/compositor.h Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
| | * | | Test-case for closing opener tabAllan Sandfeld Jensen2018-11-161-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib8b19335148ff71fa8817ce3d9a5d2af2fb9916e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Allan Sandfeld Jensen2018-11-163-15/+5
| | |\| | | | | | | | | | | | | | | | | Change-Id: Ie8d7348a1223ec92dfe06e579e0680c75012c260
| | | * | Update ChromiumAllan Sandfeld Jensen2018-11-142-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes one security fix from Chrome 70.0.3538.102 Changes: ce79ab59a09c [Backport] Skip deleted object files in POSIX base::debug::StackTrace 573ac8f40079 Disable some DCHECKs to fix printing 9ca99cf7418b Cherry-pick certain macOS V2 sandbox rules into the V1 sandbox rules ba7a77a4fbd5 Stop orphan child processes from staying alive on Windows c04d5ad155f0 Do not make tools for webkit layout tests 071af956fdf4 Make sure we do not use png for host build c2aeb1c6d21c [Backport] Fix for CVE-2018-17478 91432e048e9b Fix assert in V8 mksnapshot when building on macOS Change-Id: I80fce63a87cc15d0bfe26f8b98dcfe5bca05c0e7 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | | * | Add missing refactoring for glxGetProcAddressMichal Klocek2018-11-131-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9ad3c7aa fixed regression, however refactoring which took place 9397251b is missing. Task-number: QTBUG-70696 Task-number: QTBUG-71742 Change-Id: I4ff3f5fbbd14996478299f51a3d766d2fa1a7017 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * | | Reinstate skipping content/browser for jumbo-buildsAllan Sandfeld Jensen2018-11-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are hitting OOM crashes on the CIs again. Change-Id: Ief97b83b26091136acf4988e555b331191ce8271 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | | Speculative fix for disable-pinch not workingAllan Sandfeld Jensen2018-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces logic from render_widget_host_view_android.cc to ignore pinch gestures when pinch is disabled. Fixes: QTBUG-70913 Change-Id: Ib88c423c248148afdb2d203f89ab90c63b32012c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | | Fix autoscrollingAllan Sandfeld Jensen2018-11-144-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing the connection between on begin frame and progressing auto-scroll. Change-Id: I651b35c031afedc9aeef1dc6a16547757b869633 Fixes: QTBUG-71370 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | | Fix typos in html testsTamas Zakor2018-11-145-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I578595a1efa5e9a560b98e7a0a138621fdd04245 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>