summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I701139c5bdbc463eebd4b1ef702e6ce226c9ba32
* Add auto tests for MultipleMouseClickHelperPeter Varga2017-08-317-0/+319
| | | | | | | | | | | Qt WebEngine implements a custom handler for multiple mouse clicks. These tests are intended to test whether the mouse click events are properly forwarded to the Chromium's RenderWidgetHost. Custom mouse click test functions have been also added for the custom mouse click handler. Change-Id: Ifdc7d09f5e0f0f76c37e137e5743482bf3fb8abb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add https to list of internal schemesViktor Engelmann2017-08-302-2/+4
| | | | | | | | | | | | | Since https is an internal scheme, it should be in this list of internal schems. This also prevents custom custom QWebEngineUrlSchemeHandlers to register "https". Although it is debatable whether this is necessary, https should be held to at least the same security standards as http, which is also in that list. Task-number: QTBUG-56894 Change-Id: I83d0130541fe3b5831bf29d429bad89a8fc5408c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Make deletion of CallbackSpy safeMichal Klocek2017-08-282-7/+24
| | | | | | | | | The deletion of CallBackSpy before web engine page destruction could end up in segmentation fault. Make CallbackSpy safe to be deleted before web engine page. Change-Id: I71a184091c0251c61e3383010e3badfef5cb6124 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* Fix documentation of FullScreenRequestSzabolcs David2017-08-232-9/+9
| | | | | | | | It was registered as FullScreenRequest in plugin.cpp, not WebEngineFullScreenRequest. Change-Id: Ib9eec950a0f54aad2dbc31e54d6d5c6a6838ac65 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Emit loadProgress only between loadStarted and loadFinishedViktor Engelmann2017-08-223-12/+34
| | | | | | | | | | | | | | | | | | | We now track the values we send to the loadProgress signal. We store the last value in a new int WebContentsDelegateQt::m_lastLoadProgress and only send values that are >= m_lastLoadProgress to ensure monotonicity. A value < 0 indicates that no loading is going on. Only on loadStarted it is set to 0 (and a loadProgress is emitted with progress 0) and on loadFinished, it is set to -1 (and a loadProgress is emitted with progress 100). This way, we ensure that you first get a loadStarted signal, at least two loadProgress signals (0 and 100) and a loadFinished signal AND all loadProgress signals come in a monotonous order. Task-number: QTBUG-57839 Task-number: QTBUG-61815 Change-Id: I219d3bffbd5691adb892a11b79647ba9e1ed248e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-08-1474-443/+1271
|\ | | | | | | | | | | Includes sha1 bump of src/3rdparty to head of 58-based. Change-Id: I37743c3979c1b6fb21f71eab7048e82f7aa5d78b
| * Set web contents font setting to defaultAllan Sandfeld Jensen2017-08-031-0/+10
| | | | | | | | | | | | | | | | | | | | Chromium has since version 50 overridden the global font settings with the settings of every web contents created, so we need to first set the global settings in the web contents, to still follow system defaults. Task-number: QTBUG-62146 Change-Id: If10847c81beda08ecb7bfdf7556e39b1d2989754 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Doc: List some command-line arguments that are useful during debuggingLeena Miettinen2017-08-031-1/+32
| | | | | | | | | | | | Task-number: QTBUG-61796 Change-Id: I76d3fec780796dd0f300c54a1bccecc50f7270e0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix signal name in simplebrowser example documentationJüri Valdmann2017-08-031-1/+1
| | | | | | | | | | Change-Id: Id3bf1218e43609cdb471e087e2077d4c0c0e5153 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix simplebrowser crash on exit while downloadingMichal Klocek2017-08-022-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | On webengine profile destruction all download items in progress are canceled. This triggered stateChanged of QWebEngineDownloadItem which called lambda function on already deleted object. Do not use lambda functions in this case. Change-Id: Ia1d359fe47204baa51f1380d1c3547c28550bc28 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
| * Fix reorder warning in proxy_config_service_qt.cppPeter Varga2017-07-311-2/+2
| | | | | | | | | | | | Task-number: QTBUG-61910 Change-Id: I894d1f180ba9952213b6f67a2445aa927dfd7e9b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix demobrowser to not crash when switching to private browsing modePeter Varga2017-07-311-2/+0
| | | | | | | | | | | | | | | | | | | | Old QWebEnginePage is destructed by the QWebEngineView::setPage() call. No need to destruct it explicitly. Task-number: QTBUG-62147 Change-Id: I8ec33d5df618f69e4acf1667490df4a67dad9a16 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix typo in dictionary pathFlorian Bruhin2017-07-311-1/+1
| | | | | | | | | | Change-Id: I398f88943e6f59781ad9227e2888cb25079b638c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Doc: Add example code for using Greasemonkey attributes in scriptsLeena Miettinen2017-07-282-2/+33
| | | | | | | | | | | | Task-number: QTBUG-61788 Change-Id: Ie6c29f3999ea795a37ea444f56e40ddc70ca1c03 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Avoid default handler in switchKai Koehne2017-07-271-1/+1
| | | | | | | | | | Change-Id: I4533e28a2c1a338abdb1d373a0a3bfe598a5edce Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Fix logic to check for proxy settingsKai Koehne2017-07-252-35/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code tried to find out whether a user has set an application proxy by checking the type of the applicationProxy. This is wrong, because a system proxy will actually also change the applicationProxy type. Instead, we now rely on QNetworkProxyFactory::usesSystemConfiguration to decide whether to use QtNetwork's application proxy, or Chromium's logic for the system proxy. We also save the state of QNetworkProxy::useSystemConfiguration to be able to track changes. [ChangeLog][Networking] Fixed an issue where system proxy settings were not picked up correctly. Task-number: QTBUG-61910 Change-Id: I1d9af3f6006ba187266fe50c645f425a46632e41 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Speculative stabilization of imeCompositionQueryEvent widget auto testPeter Varga2017-07-191-5/+7
| | | | | | | | | | | | | | | | Wait for receiver object to be set after show. Task-number: QTBUG-61816 Change-Id: I2eb62775d30b0f8f9ec3e76d60a924b56c811865 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Doc: Align QtWebEngineWidgets overview with the one for the QtWebEngine moduleKai Koehne2017-07-191-2/+1
| | | | | | | | | | Change-Id: If4db465b9764be80df7fe953be63fc1a40b60d75 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Update Simple Browser exampleJüri Valdmann2017-07-1935-354/+750
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Accept downloads and add a downloads list. - Fix toolbar icons being pixelated on hidpi screens by - enabling attribute AA_UseHighDpiPixmaps, and - replacing the 22x22 icons with 32x32 versions. - Move favicon selection to WebView to reduce duplication. - Replace UrlLineEdit with a standard QLineEdit using a QAction for the favicon and setClearButtonEnabled(true) for the clear button. - Fix bug where the "File -> New Tab" action would create background tabs because the QAction::triggered(bool) signal was connected to the TabWidget::createTab(bool) slot with the bool argument having a completely different meaning between the two. - Make the toolbar unmovable. Nobody wants to move the toolbar. - Add tooltips to toolbar buttons. - Add tooltips to the tab bar (page titles). - Stop adding icons to menu items only to disable them right after. Task-number: QTBUG-60655 Change-Id: I10cc0fa82dbf39281bbdbbf9ef901e1b26402f80 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Remove third_party/afl from Chromium snapshotKai Koehne2017-07-191-0/+1
| | | | | | | | | | | | Task-number: QTBUG-61954 Change-Id: I681f7adaab1e0ef1ec162fa98c4a70569e8c3948 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix C-ABI breakageMichal Klocek2017-07-192-1/+124
| | | | | | | | | | | | | | | | Re-export missing C memory handling functions. Task-number: QTBUG-61521 Change-Id: I8f94d93a70c81117735a9610e391a1e31c54f15a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Support command-line argument --force-webrtc-ip-handling-policyAllan Sandfeld Jensen2017-07-181-0/+6
| | | | | | | | | | | | | | | | | | | | This command-line argument makes it possibly to block exposure of internal IP addresses when WebRTC access hasn't been granted, using --force-webrtc-ip-handling-policy=default_public_interface_only Task-number: QTBUG-57505 Change-Id: I0cddd1b20e0814811894204cb31e0c463a75f7be Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Yield error if the build directory contains spacesJoerg Bornemann2017-07-171-4/+7
| | | | | | | | | | | | Task-number: QTBUG-61275 Change-Id: I7e741ffaaa4044b3b61b6df06ea3eab181db9c97 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Fix propagation of unhandled key press eventsJoerg Bornemann2017-07-142-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhandled key presses for printable keys were not received by the parent widget anymore. This was a regression from 5.8.0. The propagation is suppressed if NativeWebKeyboardEvent::skip_in_browser is true. Commit 4501b9d8 accidentally removed the wrong skip_in_browser assignment. Task-number: QTBUG-61621 Change-Id: I7eafa1fac5fb9a7edc4af2bc1aac21c106264713 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * Properly document third party code in examplesKai Koehne2017-07-1317-29/+140
| | | | | | | | | | | | | | | | | | | | | | Move files from marked, markdown.css to a 3rdparty directory, and properly document them with a qt_attribution.json file. Finally, reference the (automatically generated) documentation in the respective examples documentation. Task-number: QTBUG-61706 Change-Id: I8fd3f894e6e81647bc4804df784b1e00b83d12d6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Examples: Add recipebrowser to top-level .pro fileKai Koehne2017-07-131-1/+2
| | | | | | | | | | Change-Id: I7d22a9c2a4f4aed1f364e672985da357158467e7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Update ChromiumMichal Klocek2017-07-131-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls following changes: 1a14be1 Enable using gnu thin archives on Linux 296b240 Silence gcc -Waddress warnings in logging.h fabd7e0 Fix building without git installed 1173dda Do not export c memory handling functions 25ceaa6 Do not launch zygote processes in single-process mode 721a4d1 Carry over user-agent override when opening new windows Change-Id: If48223d76fbb35f1847e416a7f244e4b6ed85f33 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Document about popups not appearing on Windows when in fullscreen modeAlexandru Croitor2017-07-132-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows there is an issue that an OpenGL-backed fullscreen window will prevent other top-level windows from appearing on top of it (for example a select / combo box popup). This appears to be a limitation of the Windows platform compositor (DWM). The workaround is to call QWindowsWindowFunctions::setHasBorderInFullScreen on the QWindow which will show the fullscreen WebEngine view. Task-number: QTBUG-61563 Change-Id: I5e0f08ef49de6119ef7910cec2b32ea267301c18 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Take into account the value of the --touch-events Chromium switchAlexandru Croitor2017-07-112-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Chromium 56 the --touch-events switch controls both the availability of the Touch Events API in JavaScript (presence of 'ontouchstart' in 'window' object), and whether touch events are dispatched at all. In Chromium 57, the switch controls only the Touch Events API availability, and touch events are always dispatched. In Qt 5.9.0 which is based on Chromium 56, we always dispatched touch events, ignored the value of --touch-events, and determined the availability of the Touch Events API by checking if QTouchDevice lists any touch screen devices (essentially Chromium's --touch-events=auto option). This commit changes the behavior of WebEngine to match that of Chromium 57, so that users can choose to enable or disable the Touch Events API via the --touch-events switch, whereas the default will be 'auto' mode. Touch events will always be dispatched as usual. Users that wish to stop dispatching touch events can install an event filter on WebEngine's view focus proxy. Task-number: QTBUG-61045 Change-Id: I07404af3336619869aa87a90a1b426036548dd55 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix "Could not share GL contexts" warnings on WindowsAlexandru Croitor2017-07-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | Make sure that a non-Core Profile OpenGL Context is created on the Chromium side, so that sharing between the Qt global context and the Chromium ones works. Change-Id: Ifc5f39268395615fe50c8aa9467f833c0de233a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
| * [macOS] Use the OpenGL CoreProfile when the global shared context doesAlexandru Croitor2017-07-113-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when a default QSurfaceFormat was set with an OpenGL Core profile, all the contexts created on the Qt side would obey the profile, but Chromium would still use the Compatibility profile for its contexts leading to warnings when trying to create shared contexts. The fix is to check which OpenGL profile is used in the Qt global shared context, and pass that information along to Chromium. Note that this works only on macOS for now, and the default non-Core profile is used on other platforms, even though Core was requested. Passing CoreProfile to Chromium on Windows and Linux currently leads to crashes. Task-number: QTBUG-60605 Change-Id: I27a77091923624d19ccc2019953a5b07f9282916 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove support for building with Qt versions < 5.8.0Allan Sandfeld Jensen2017-08-0414-175/+34
| | | | | | | | | | Change-Id: I2f2ba754111e198298b7d1a595343fcd773e05e5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Move NSS certificate handling configuration to configure.jsonAllan Sandfeld Jensen2017-08-042-10/+21
| | | | | | | | | | | | Change-Id: Ibae2b8ebb90e79ff8337d994b2234eed5e230dcc Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Reorder documentation for QtWebEngine dictionary discoveryFlorian Bruhin2017-08-044-68/+40
| | | | | | | | | | | | | | | | | | | | This also adds documentation for QTWEBENGINE_DICTIONARY_PATH from my previous change. Change-Id: I85cd7476c095d5427e2db3a909449838a2362b81 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Add a QTWEBENGINE_DICTIONARIES_PATH environment variableFlorian Bruhin2017-08-041-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a Linux system with an installed application, the only places dictionaries are searched currently are /usr/bin/qtwebengine_dictionaries and /usr/share/qt/qtwebengine_dictionaries (or similar, depending on the distribution). This adds an environment variable which makes it possible to customize the location dictionaries are in (e.g. to something user-writable). Documentation is added in the next commit, as it was duplicated in four different locations and I cleaned it up a bit. [ChangeLog] New QTWEBENGINE_DICTIONARIES_PATH environment variable to customize the location for spell checking dictionaries. Task-number: QTBUG-62236 Change-Id: Iefc90451c537656025abb785291fe55f6a82d50c Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Add HideScrollbars settingPeter Varga2017-08-028-33/+44
| | | | | | | | | | | | | | [ChangeLog][Settings] Added setting to hide scrollbars. Change-Id: I17695bb54a460621358345d303302b93eb342696 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix viewport information in simplebrowserPeter Varga2017-08-021-1/+6
| | | | | | | | | | | | | | | | | | Resize QWebEngineView explicitly as a workaround for background tabs. Task-number: QTBUG-61770 Change-Id: Iaa792cb01788c9c33b6992a08a05b0cf11d0579d Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Remove DemoBrowserJüri Valdmann2017-07-2679-14753/+16
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Examples] Removed WebEngine Demo Browser example, which got superseded by the improved WebEngine Widgets Simple Browser. Task-number: QTBUG-59819 Change-Id: I214e6f5f3a946ed617a9f4d628d3259a69874ca1 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix emitting selectionChanged signal for non-user text selection changePeter Varga2017-07-204-43/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when the text selection is triggered by JavaScript. Text selection changes triggered by IME composition text replecement are ignored. Test has been added for mouse selection clipboard: non-user text selection should not update the clipboard. Pulls in Chromium changes: 3deea95 Update TextSelection for non-user initiated events Task-number: QTBUG-53134 Task-number: QTBUG-60381 Change-Id: Ib94f57a2aa61248fba75f595245fb388b9609b6c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update ChromiumPeter Varga2017-07-201-0/+0
| | | | | | | | | | | | | | | | | | | | dfaf156 Remove third_party/afl 059d826 [Backport] Initialize RenderSandboxHostLinux in --no-zygote mode to not crash. 16b932b Add .gitignore for *.pyc Task-number: QTBUG-61954 Change-Id: Ib10d09b8c0a771fb9b200a1947dbf9bb320cb1f2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add method for triggering downloadsFlorian Bruhin2017-07-193-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | The method download(const QUrl &url, const QString &suggestedFileName) already exists in WebContentsAdapter. It is now accessible through a corresponding method in QWebEnginePage. [ChangeLog][QtWebEngineWidgets][QWebEnginePage] New QWebEnginePage::download() method to start custom downloads for a web page. Task-number: QTBUG-55944 Change-Id: I185ec69c1668b377a129bc9fc09963278e52de1e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove tst_QWebEnginePage::scrollToAnchor auto testPeter Varga2017-07-191-37/+0
| | | | | | | | | | | | | | | | | | | | The tested QWebEnginePage::scrollToAnchor API can't be added to QtWebEngine for now. Currently, Chromium Content API doesn't support to control page scroll. The corresponding feature can be used by URL fragment identifier (#anchor) or JavaScript API (location.href). Change-Id: Ie9c87758d458858ba677d309a548cdced525557b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix deprecation warning in the Quick APIPeter Varga2017-07-191-1/+1
| | | | | | | | | | | | | | | | Use QCoreApplication::sendEvent() instead of QQuickWindow::sendEvent() as documentation suggests. Change-Id: I3222d5ec41aeca80efbe06f705ee73e19ea37489 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Make error message more verbose in QML test test_loadProgressViktor Engelmann2017-07-191-1/+2
| | | | | | | | | | | | | | | | | | | | If the verify(loadProgressMin <= loadProgress) fails, the output was not verbose enough. The additional outputs will tell us more about what caused the test to fail. Task-number: QTBUG-61815 Change-Id: Ia9b45ef4f09a5b25a344e423a7b0c61d5d430542 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Do not send empty WebChannelIPCTransportHost_SendMessageStephan Reiter2017-07-192-4/+10
| | | | | | | | | | | | Task-number: QTBUG-61969 Change-Id: I3367889041614a5e7489909dd38c8af638edf17c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Increase timespan for WebViewFindText::test_findTextInterruptedByLoadViktor Engelmann2017-07-192-9/+6
| | | | | | | | | | | | | | | | | | | | The timespans here are 5 seconds by default. These are not enough for this test and make it fail often. We therefore increase the timespans and un-blacklist the test. Task-number: QTBUG-61887 Change-Id: I6acc2dee78fb4d589fd87f7557e0d48725b36f08 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Cleanup support for desktop captureJüri Valdmann2017-07-1714-173/+505
| | | | | | | | | | | | | | | | | | - Use feature permissions system instead of hard-coded dialog. - Add QML test for getUserMedia() and extend existing widgets test. Task-number: QTBUG-60832 Change-Id: I533bed5021b3b0ee199b8abc6ddbd516cbd14ff6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Blacklist flaky WebEngineViewLoadProgress::test_loadProgressViktor Engelmann2017-07-171-0/+3
| | | | | | | | | | | | | | | | | | | | We blacklist the qmltest WebEngineViewLoadProgress::test_loadProgress for now, because it fails often, causing trouble with integrations on the dev branch. Task-number: QTBUG-61815 Change-Id: Ifa74dcc0536075842af935613b5ad8ffcd56cef1 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/devAllan Sandfeld Jensen2017-07-164-5/+14
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 15:42:02 +0000