summaryrefslogtreecommitdiffstats
path: root/src/core
Commit message (Collapse)AuthorAgeFilesLines
* Extend HttpCacheType with NoCache optionSzabolcs David2016-01-272-1/+5
| | | | | | | | | Add option to disable cache with passing NULL as cache backend. It behaves the same way as using HttpCache::set_mode(DISABLE), but saves some memory without instantiating backend factory. Change-Id: I1565cc773eda21a6bc73eebe14ab8046252a7755 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Remove superfluous enable_plugins=1Kai Koehne2016-01-272-2/+0
| | | | | | | | chromium/build/common.gypi already sets enable_plugins to true by default for desktop platforms. Change-Id: I3805a6856fe70ad3bd89606e974b02858e68e263 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Package devtools_resources separatelyKai Koehne2016-01-275-3/+19
| | | | | | | | | | | Move the resources for remote debugging out of qtwebengine_resources.pak, into a separate qtwebengine_devtools_resources.pak. This allows developers to decide at deployment phase whether to ship the (rather large) resources for the devtools feature, or not. Task-number: QTBUG-50646 Change-Id: I74c75ad30989b97a63e6bce3abbc33360d1452e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix un-processed drag events not being handled on OSX.Alexandru Croitor2016-01-233-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QDragMoveEvent is posted, we have to notify Chromium, and wait synchronously, for the possible drag and drop action at the respective coordinates. This is done by executing an inner event loop. The drag move event was processed in the inner event loop as a side-effect, specifically when another event (like a QMouseMove or QKeyPress) was forwarded to Chromium, which in turn called DoWork implicitly. The side effect led to incorrect behavior, when the mouse button is released and the drag operation should be finished. What actually happened is that additional queued DragMove events were being sent by OSX after the mouse release, and the process was stuck in the inner event loop, because Chromium's DoWork was never called. And only after moving the mouse a bit (and thus forwarding MouseMove events), the inner event loop was quit, and the drag operation finished. To actually make Chromium handle the DragMove event, we have to manually call DoWork on the inner event loop. Also because the possible drag and drop action is sent via IPC from the render process to the main process, there is a race condition that the the message might not be handled on the first manual call of DoWork, so we set up a QTimer to continuously call DoWork, thus polling for the message. Once the message is handled, the timer is stopped. In practice this leads to at most two timer timeouts. Change-Id: I8dc37a9c47ea5b675e15ebd138bc0e616b522049 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Enable Widevine CDMAllan Sandfeld Jensen2016-01-1912-1/+420
| | | | | | | | | | | Enable loading Google Chrome's Widevine pepper plugin. Flash and Widevine plugins will now also be searched for in the plugins/ppapi directory. Task-number: QTBUG-50132 Change-Id: I28fb56bb08d7e81629e34420be626621a7981181 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-189-162/+89
|\ | | | | | | Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
| * Merge remote-tracking branch 'origin/5.5' into 5.6Allan Sandfeld Jensen2016-01-181-9/+28
| |\ | | | | | | | | | Change-Id: I591be7a7131d85a269bf12fbd5c47a0ccf6ce574
| | * Update key code mappings using QtWebkit mappings as reference.Alexandru Croitor2016-01-121-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copy additional key code mappings from PlatformKeyboardEventQt.cpp. Also add a mapping for missing numeric keypad equals key. Change-Id: Ia6c4413795293be84bcd8ea9d981d8cdfb94509b Task-number: QTBUG-50401 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * Send proper key codes for KeyEvents to WebKit.Alexandru Croitor2016-01-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few KeyEvents to key code mappings were incorrect or missing. Fix them. Change-Id: I74087768fddd467993f04ed8b4c2dc6345d20e8a Task-number: QTBUG-50354 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Remove FilterRequest from qwebenginecookiestoreMichal Klocek2016-01-154-51/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnCanSetCookie and OnCanGetCookies should both be mapped to API. Since the other call is missing (filter cookies which should be send) remove existing one from 5.6 Change-Id: I4f42c4a1fee6add7a5efffaf4c38877a1f35ce61 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Remove callback functions from qwebenginecookiestoreMichal Klocek2016-01-152-84/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all callback api calls, rename getAllCookies to loadCookies, update documentation. New function name reflects the fact the cookieAdded signal is always emitted when cookies are loaded from the store. Change-Id: Iab7bb04871c7396d2e23306a10084d425426a19f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix crash in BrowserContextAdapter::removeCustomUrlSchemeHandlerJoerg Bornemann2016-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Do not cache the end iterator, because erase might invalidate it. Do not increment the iterator in the erase case. Change-Id: I1cbad04fdaaf1bf4cfae252bb7569d817b6ab5a5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix access of freed dataAllan Sandfeld Jensen2016-01-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The string parts inside the lambda construction were already freed, so instead use a simpler construction where we are sure we are still holding the stringlist. Change-Id: I3559ab9d203b368e2d62efef73497ce7f9135cc5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fix access after freeAllan Sandfeld Jensen2016-01-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | If deleteLater is called from the destructor of LocationProviderQt, QtPositioningHelper shouldn't be accessing LocationProviderQt from its destructor. Change-Id: I1f2344edc1918fcfa566c3cd6045694cabf89768 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Have a WeakPtrFactory per thread in URLRequestCustomJobJoerg Bornemann2016-01-152-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must separate WeakPtrs per thread. Otherwise we run into a DCHECK in weak_ptr.cc: "WeakPtrs must be checked on the same sequenced thread.". Done-by: Allan Change-Id: I6ae971b01fb8f8ecda13e50798d6315dcf19d96e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Fix access violation error because of access to an invalid QString.Alexandru Croitor2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6ed125c0073288f46e544b9d415d1f9a9968cb2d introduced the usage of QT_USE_QSTRINGBUILDER, which caused an issue in BrowserContextAdapter::httpAcceptLanguageWithoutQualities, incorrectly deducing the return type of the lambda. Fix consists in explicitly setting the return type of the lambda to QString. Change-Id: If3f8992e031838e899d35bcd2f962d051976a8f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add API to set WebChannel on isolated worldAllan Sandfeld Jensen2016-01-158-22/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to set a web-channel so that it can only be accessed by private scripts. Pulls in needed API extension in 3rdparty. Task-number: QTBUG-50318 Change-Id: I61bcce5c318dffe0a406ee8cddf31f58a021c22c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge "Merge branch '5.6' into dev" into refs/staging/devAllan Sandfeld Jensen2016-01-1335-115/+378
|\ \ \
| * | | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-1235-115/+378
| |\| | | | | | | | | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| | * | Move ICU data to resources sub-dirAllan Sandfeld Jensen2016-01-112-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moves the ICU data from the prefix root to the resources subdir. Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-112-0/+5
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-072-0/+5
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginepage_p.h Change-Id: I050b4c7691a070e04cace2663ad633903f6d96a9
| | | | * Fix MouseMove event handling when opening a new tab with middle click.Alexandru Croitor2015-12-222-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening a new tab by middle clicking on a link in a web page, two MouseMove events are sent to Chromium consecutively, without getting proper acknowledgment events, which causes further move events not to be handled properly. Fix consists in preventing the second move event from being sent. Change-Id: Ia0a64698476226e472faa53f75b51dfb6ed477c9 Task-number: QTBUG-50031 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Implicitly use QStringBuilder in all modulesJoerg Bornemann2016-01-095-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every Qt module is built with QT_USE_QSTRINGBUILDER by default. Also define QT_USE_QSTRINGBUILDER in the core API library. Remove superfluous qstringbuilder.h includes. Keep the use of operator% to make sure that QT_USE_QSTRINGBUILDER won't vanish in future build system changes. Change-Id: I41fd036fc4e6063951cd758aaafdf9aefed7dd5a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Simplify search for Flash plugin on WindowsKai Koehne2016-01-081-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for C:\Windows\SysWOW64 is actually non needed, because 32 bit apps will automatically see this directory as "C:\Windows\System32" on 64 bit Windows. Change-Id: Ic2e847a287632955970893be91b00489dd7ab0a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | Fix resources location for developer buildsJoerg Bornemann2016-01-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pak files must be in a "resources" sub-directory since commit d18b3e7c. Change-Id: Ia5191b1c532cf630be8c2d123261421a39d6a5ee Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | Enable loading of Flash plugin on Windows 64 bitKai Koehne2016-01-071-2/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pepper plugin is available on 64 bit in C:\Windows\System32\Macromed Also do not give up after finding a candidate file (because it might be the wrong bitness). Change-Id: I70af34fbcabeec792e8c74d8010476477c6e91dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Install qtwebengine resources in a sub-directoryAllan Sandfeld Jensen2016-01-062-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the qtwebengine resource files to a resource sub-directory so they are not installed in the prefix-root. At the same time the search of them is improved, so application developers can install them in the application dir, even if the prefix dir exists. Change-Id: If64f16ae6ee924c66fb0a0b024bca2caa6400ee3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | Propagate qmake's warnings-are-errors settingAllan Sandfeld Jensen2016-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable -Werror when Qt is configured to not use it. Change-Id: Icc4d291cf941fc27b19aa2170796985c20eced8e Task-number: QTBUG-50254 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Fix more syncqt warningsAllan Sandfeld Jensen2016-01-0510-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change include form to follow standard Change-Id: I8b30ae9a6923365d524c473f2807b76e4fccebf4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Fix an assertion in QWebEngineCookieStoreSzabolcs David2016-01-054-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't process pending cookies after resetting the CookieMonster to 0 in the CookieMonsterDelegateQt. We are destroying the old cookie store, so we can reject the pending cookies here. Task-number: QTBUG-50160 Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Use QOpenGLContext::isOpenGLES() to check if OpenGL ES is enabledSiteshwar Vashisht2015-12-211-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLContext::openGLModuleType() performs a general check whether OpenGL ES support is enabled or not. However it is possible that a specific OpenGL context does not have OpenGL ES support enabled even when QOpenGLContext::openGLModuleType() returns QOpenGLContext::LibGLES. In such situations QOpenGLContext::isOpenGLES() method is correct way to determine if the context is an OpenGL ES context. Task-number: QTBUG-50015 Change-Id: I319c2932a62027d3142040045a46cdcb12fcdebe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Use default URLRequestInterceptors passed from ChromiumAleksey Yermakov2015-12-165-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default URLRequestInterceptors are required for App Cache and Service Workers support. They were previously ignored and dropped in BrowserContextQt::CreateRequestContext. Implementation in content shell was taken as a reference. Change-Id: I5a12e90febdb4c639f9ead9faf044df09431bdd0 Reviewed-by: Aleksey Yermakov <jp.kuraisu@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Move WebEngine initialization to core libraryAllan Sandfeld Jensen2015-12-152-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means QtWebEngineWidgets no longer needs to depend on and link to the QML API. Change-Id: If59693bf0ae1fb43dc86c141daf4e09c8cc68c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Fix some syncqt warningsJoerg Bornemann2015-12-113-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f224e96138117bdf202084231ce6c805e15f5b2 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Make use of QObject's d-pointer in QWebEngineCookieStoreJoerg Bornemann2015-12-104-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This safes us from managing d_ptr/q_ptr pairs and saves a bit of memory. Change-Id: Icdd692c5ddf0980de980bebb691ecf51b738acaa Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Merge remote-tracking branch 'origin/5.5' into 5.6Michael Bruning2015-12-092-24/+81
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp Change-Id: I451bc61673014db8e87b2a2cf98fb6879ce0e58d
| | | * Reuse or clean up HttpNetworkSession when (re-) setting a cache type.Michael Bruning2015-12-042-24/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not reusing or cleaning up the session led to race conditions which in turn lead to crashes and asserts. Reuse the session if parameters match, clean up and it recreate otherwise. Task-number: QTBUG-49397 Change-Id: I4f846a448b50d80a3cf7c4f9bb833fa6d64974d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | | * Fix embedded Linux debug buildJoerg Bornemann2015-12-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The icu header files are picked up from src/3rdparty/chromium/third_party/icu, but the syroot's icu libs were linked. Do not claim to support linking against the sysroot's icu. This never worked properly in 5.5. Task-number: QTBUG-49693 Change-Id: I7dca37ecefbc5b1dabfadf86540442b8face8347 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | Make the MIME-type of downloads availableAllan Sandfeld Jensen2015-12-072-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An application currently have to rely on suggested filename only to guess the type of a download. This is often insufficient when the suffix is misleading or missing. This patch adds the mimetype to the reported metadata and also adds a mimetype appropriate suffix to suggested filenames. Task-number: QTBUG-48206 Change-Id: I4c70f076d6eb5ae820fd6b7f568515eeb7c18df5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | Doc: mark QWebEngineUrlRequestInfo::changed() internalLeena Miettinen2015-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to stop QDoc from printing an error. Change-Id: I22ac3d94e4f8ad53c0bfbda97a71c615a43a2262 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | | Reduce javascript dialog URL to originAllan Sandfeld Jensen2016-01-131-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | In recent versions of Chromium the origin_url given to RunJavaScriptDialog have become a full url instead of a URL on origin form. To maintain the previous behavior we need to extract the origin subset of the URL. Change-Id: I4cc82ddd81c0330fd3741297395f72e89a267d51 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add methods for running javascript in isolated worldsAllan Sandfeld Jensen2016-01-083-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | We exposed javascript worlds for user-scripts, this adds variants of runJavaScript that can access those worlds. Change-Id: I5a0b40b863b543cd364c902d0a84ae2c35e2a0b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Switch WebChannel's IPC transport to ginAllan Sandfeld Jensen2016-01-075-45/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium has ported all their old V8 extensions to gin, this does the same for our extension. This should make it faster as it requires no parsing of JavaScript on startup. Change-Id: I1f791e71cafb9b60dd9787ae03a18e723dfef6b9 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Add function to clear data from the cacheSzabolcs David2016-01-064-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | It marks the entries of the current cache backend for deletion and starts to remove them. Task-number: QTBUG-48177 Change-Id: I85ec25048ff5429976f1b2dcacd74666bdbe6624 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Respect --enable-smooth-scrollingAllan Sandfeld Jensen2016-01-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change the scroll animator default to follow the same flags as used in Chromium. Change-Id: Ic6a9d23950f2ac6a18bd9b4e58cbedf560943717 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | Implement drag and drop supportJoerg Bornemann2016-01-038-10/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a QDrag for drag and drop operations that are started in the web page. React on drag and drop event of QWidget and QQuickItem. Task-number: QTBUG-43008 Change-Id: If09f09de6e6d5b5f02835985a17cc6bc3262f411 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.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-154-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>