summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
Commit message (Collapse)AuthorAgeFilesLines
* Add gn generator for pro filesMichal Klocek2016-12-161-215/+0
| | | | | Change-Id: I5f28314d79b4aad587b323b027eb6d74ad422a73 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move the QPrinter and QtWidgets related code out of the PDFium wrapperMichael Brüning2016-11-251-5/+2
| | | | | | | | | | | This moves the actual printing using QPrinter to the WebEngineWidgets part of the API. The printsupport module depends on the widgets module and therefore QtWebEngineCore also had a dependency to widgets. This is removed by this change. Change-Id: If6e5745709a59de18f2123b930cbe6e64390c867 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Allan Sandfeld Jensen2016-11-251-0/+1
|\ | | | | | | | | | | | | Conflicts: src/3rdparty Change-Id: Ib9c9eca457c1c42dab948e6cb56d44b57d5da32a
| * Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-11-241-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/api/qwebengineurlrequestinfo.cpp src/core/api/qwebengineurlrequestinfo.h src/core/core_gyp_generator.pro Change-Id: I5c78f0c86f6dcd61697148f0729d3d3a2cb2c76f
| | * Fix IPC message loggingPeter Varga2016-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register Qt IPC messages for logging. The usage of content::RegisterIPCLogger function adds the content_common.content_ipc_logging.o to the link dependency. Thus it will register the Chromium Content IPC messages too. Task-number: QTBUG-57224 Change-Id: I2c45691feb22a34f6074940cc35b8a4ba7804370 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Fix building when QT_NO_OPENGL is definedAndy Nichols2016-10-021-6/+12
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54327 Change-Id: I759598d56aa0a74b64092365b422a743fb508ac6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Cleanup directory structureAllan Sandfeld Jensen2016-09-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src/core/renderer directory is meant to contain files that would be in the renderer process and the chrome/renderer subdirectory in chromium, but a few classes from the browser process and the renderer_host dir has snuck in. This patch cleans up the structure so that classes in the browser that serves as host classes for renderer classes goes in renderer_host. Change-Id: I9333b1322e2246d4da9b4e8cfe6be604f6d996bf Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | Fix namespace build on macOSAlexandru Croitor2016-09-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The namespace build was broken because both Qt and Chromium try to forward declare NSString in certain cpp files. The forward declarations were incompatible, because the Qt NSString was inside a namespace which is brought into scope with "using QtNamespace::NSString", whereas the Chromium one isn't in a namespace, and that leads to ambiguity issues. Fix is not to use QT_FORWARD_DECLARE_CLASS which prepends the Qt namespace, but rather do a simple forward declaration. Change-Id: I8cd5fd0a9a2f62643f6afbd4508df885e13c9ae5 Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add core code for printing PDF data using PDFiumMichael Bruning2016-08-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables printing PDFs to QPrinters via PDFium. Bitmap to QImage conversion code based on code by Paulo Pinheiro <paulovap.os@gmail.com> Task-number: QTBUG-50556 Change-Id: I536200dc3dc56109624959b1d3d4644e4c20d1c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Adjust webengine to the qtConfig() changes in qtbaseLars Knoll2016-08-231-2/+1
| | | | | | | | | | | | | | | Change-Id: I907f6ea73a1d707eda536764c4b0b2edea49a963 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Move core_generated.gyp to build directoryAllan Sandfeld Jensen2016-07-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes core_generated.gyp from being generated in the source directory to being generated in the build directory. Task-number: QTBUG-43014 Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Switch to using upstream pepper flash clipboard implementationAllan Sandfeld Jensen2016-07-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Using the upstream versions means we will automatically get adjustments to changes in Chromium API. Change-Id: I5f4c94b836bee3f2f507189182145e4f667a88f9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | Fix changing locale of ResourceBundle on LinuxPeter Varga2016-07-131-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ResourceBundle is not re-initialized for new Renderer Processes because it is initialized only once in Zygote Process. This means runtime locale changes do not affect new Renderer Processes. Zygote Process is supported on Linux only thus other platforms don't need this fix. With this change the locale of the ResourceBundle is reloaded when new Renderer Process is started. For accessing the pak file of the locale in the sandboxed environment the file descriptor is passed via the Chromium's GlobalDescriptor solution. Task-number: QTBUG-53000 Change-Id: I57e84078db9d0795d16d930aa1b3e93a6e86ec39 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-0/+2
|\| | | | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Implement flash clipboard interfaceAllan Sandfeld Jensen2016-06-101-0/+2
| | | | | | | | | | | | | | | | | | Fixes clipboard access from flash and fixes an assert when using the copy button on codereview.qt-project.org. Change-Id: Ia66ada8a1195a51a26d2b3fd689ddc867bc8d422 Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix copying images to clipboardJoerg Bornemann2016-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The SkBitmap to QImage conversion in ClipboardQt::WriteBitmap was hardcoding the image format to ARGB32. This failed whenever the format of the SkBitmap provided by Chromium was different. This change backports 1cf9175e from 5.7. Task-number: QTBUG-52715 Change-Id: Icf27b97bc421a2201c307a4514928dcf384d9ba6 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Provide a debug version of QtWebEngineProcessJoerg Bornemann2016-05-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | We never shipped a debug version of the QtWebEngineProcess executable. This is problematic in debug_and_release builds when a debug application starts the release version of QtWebEngineProcess. The Qt libraries will then be loaded twice, in debug and release. Also, in development setups where only the debug libraries are deployed, the release version of QtWebEngineProcess cannot be loaded. Task-number: QTBUG-49493 Change-Id: I2f7bfb9c7cf8e869dc91007f4e967a713f438065 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Implement hooks for pepper isolated filesystemAllan Sandfeld Jensen2016-04-281-0/+2
| | | | | | | | | | | | | | | | This API is needed to support Netflix. Change-Id: I413a0e29e6be12fa5c70879c7127618665fc859c Task-number: QTBUG-52100 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-0/+3
|\| | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Fix Windows build when response files for moc are generatedJoerg Bornemann2016-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | moc.prf contains magic (translation: weird heuristics) to determine if the moc command line would exceed the command line length limit on Windows. If such an excess is detected a response file is created in MOC_DIR. As our build directory is not qmake's default one, moc calls will not find the response file. Set MOC_DIR accordingly to generate the reponse file in the right location. Task-number: QTBUG-51847 Change-Id: Id0695451a986cd9514a7c965c6d33c5c3ef800cd Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-081-0/+2
|\| | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| * Implement SSLHostStateDelegateAllan Sandfeld Jensen2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | This class was introduced to track accepted certificate errors. Our lack of implementation caused a regression in certificate error handling. Task-number: QTBUG-51319 Change-Id: Idf3314fd17a5f9cb13a4513a3ccdb40954519c0d Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Rename UserScriptController/Host to UserResourceController/HostSzabolcs David2016-02-101-4/+4
| | | | | | | | | | | | | | These classes can operate user stylesheets too. Change-Id: Ia283af92e52a822b26003ff65e0e7dc391b0904d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add FaviconManager to corePeter Varga2016-02-031-0/+3
| | | | | | | | | | | | | | | | | | The new icon manager uses the WebContents::DownloadImage() API for downloading icons. It proposes the best quality among the available favicons via the iconChanged signal. Change-Id: I66a014365b6f6560ff34d40ee870aee84e4e70e4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Enable Widevine CDMAllan Sandfeld Jensen2016-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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-121-0/+1
|\| | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * Implicitly use QStringBuilder in all modulesJoerg Bornemann2016-01-091-0/+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>
* | Move conversion function for keyboard modifiersJoerg Bornemann2015-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | 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 html color inputAdam Kallai2015-12-021-0/+5
|/ | | | | Change-Id: I501125631946f70aae1ff039b0e5bcb9198e7242 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Use consistent naming of Qt-specific Chromium classesAllan Sandfeld Jensen2015-10-291-6/+6
| | | | | | | | | 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>
* Remove unnecessay delegation over CustomUrlSchemeHandlerAllan Sandfeld Jensen2015-10-061-2/+0
| | | | | | | | | | | With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the indirection and delegation CustomUrlSchemeHandler provided. This means the class can be removed and we can also store the handlers directly in BrowserContextAdapter and save a copy of the installed handlers in the QWebEngineProfile. Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* fix debug_and_release build on WindowsJoerg Bornemann2015-09-241-15/+0
| | | | | | | | | | | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. There's no equivalent for this in MSVC. We hacked around this limitation in commit 38944be4 by creating a source file that includes every public header. Unfortunately this breaks debug_and_release builds, because we must inject this generated source file as absolute path, and gyp will generate the same object file for every source file that's specified with an absolute path... This reverts commit 38944be4 and replaces the work-around by simulating -whole-archive on MSVC. This is done by passing all object files that belong to qtwebenginecoreapi.lib to the linker via a response file that is created when building qtwebenginecoreapi.lib. Task-number: QTBUG-48376 Change-Id: Iaa991fe96a2c336d982d29d6924ce950c0be5398 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Add AuthenticationDialogControllerPeter Varga2015-09-061-0/+3
| | | | | | | | | The new controller makes possible to handle authentication requests asynchronously. This is essential for the authentication support in the QtQuick API. Change-Id: Ib60b58448a60e817e64477529ec4bfd1535b3d19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* MSVC: force export of API symbolsJoerg Bornemann2015-08-251-0/+15
| | | | | | | | | | | The public API symbols are compiled in a static library that's linked to core with --whole-archive when using gcc. As there's no equivalent for this in MSVC we create a dummy C++ source file that includes every API header file to make sure that every __declspec(dllexport) is honored. Change-Id: If0dafedceb52046aecde60b2a2a624df8ab219b4 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Revert "Introduce ProxyResolverQt"Pierre Rossi2015-08-191-2/+0
| | | | | | | | | This reverts commit 0e006b8ea755ebad01faf3e747e61abdf158289a. The workaround is not needed anymore since the v8 proxy resolver is now used by default. Change-Id: Ifea4ca6c6a0b0442cc1d8d22b1eb1553f3319524 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix #include's in public headersKai Koehne2015-08-041-1/+0
| | | | | | | | | | | Uniformly use the <Module/class.h> style, like https://wiki.qt.io/Coding_Conventions mandates. Change-Id: I4c05599fa689f375158fd3b0a54aada8571e5c59 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge Chromium 44 and fixesAllan Sandfeld Jensen2015-07-061-0/+2
|\ | | | | | | | | | | | | Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch, which contains all the patches to build against Chromium 44. Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
| * Permission Management for Chromium 44Allan Sandfeld Jensen2015-07-011-0/+2
| | | | | | | | | | | | | | Implementing the new PermissionManager API. Change-Id: If0fdac24b8fec561a898aba009345576b5ce7fc6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Make it possible to run applications with chromium embedded optionsAndras Becsi2015-06-301-1/+1
|/ | | | | | | | | | | | This patch adds --enable-embedded-switches command line switch to enable all the embedded switches on startup instead of during compile time. Among others this enables pinch-zoom, viewport and impl-side painting, to make it easy to run an application with these settings even if the library was not cross-compiled. On embedded these are enabled by default and can be disabled by --disable-embedded-switches. Change-Id: I366ed243f1b0e17cbeb900e672d0e15fb4a2b8b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add QWebEngineCookieStoreClient core APIAndras Becsi2015-06-161-0/+2
| | | | | | | | | | | | | | | | | This class or its subclass can be set on the QWebEngineProfile and its API enables intercepting Chromium's cookies, setting and deleting cookies in the cookie store. These functions are asynchronous so if the result of the task is needed the user can provide a callback which will be run on the calling thread when the requested operation finishes. This does not include a hook for QQuick layer yet, there we have to figure out what the most convenient way is from a developer's perspective. Change-Id: I6a3af071883ce632df7a2fb952da93f306ac3fe2 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Introduce ProxyResolverQtPierre Rossi2015-06-081-0/+2
| | | | | | | | | | | This allows using QtNetwork's proxy auto conf detection code from QNetworkProxyFactory, by setting the QTWEBENGINE_USE_QT_PROXYRESOLVER environment variable. Otherwise, we still rely on chromium's implementation. Task-number: QTBUG-45376 Change-Id: I7b8b77c932060ad36090d388d616b713d93cad0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Add public QtWebEngineCore C++ APIAndras Becsi2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a new public C++ API layer in preparation to make it possible to integrate with lower level Chromium features related mostly to networking operations like accessing and blocking cookies, custom request headers, etc. This API layer can be used both by Qt Widgets and Qt Quick applications with a small C++ core. It should contatain API to access features that usually run on the IO thread to make it possible to perform heavy tasks that would otherwise require costly context switches to the UI thread. Furthermore for these features a QML API does either not make sense, since they are non-UI-related, or a QML API is simply not feasible, because the API is meant for advanced usecases like web browser development (i.e. custom protocol handlers, network traffic interception cookie syncing, etc.). In the long term this layer could also make it possible to reduce code duplication in the widgets and quick layers by moving common parts to the core layer. The new API is built entirely by qmake as a separate static library which is then linked into the QtWebEngineCore library built by gyp and ninja, to prevent the build options passed to Chromium to break the API layer. As a first step this only contains the global headers for core. Change-Id: Iccf8544587cde7c0d9c6abd462e4766bf9ec81ae Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Support QNetworkProxy::applicationProxyPierre Rossi2015-05-291-0/+2
| | | | | | | | | Implement a ProxyConfigService that keeps track of the state of Qt's application proxy which, if set, takes precedence over the system settings. Change-Id: I7f1eba9015b70cf90f53a41736dd0a6d0ad28489 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-191-0/+1
|\ | | | | | | Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
| * Fix QtCreator loading of qtwebengine.proAndras Becsi2015-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When QtCreator loads qtwebengine.pro some parsing errors are shown if it picks up the system python3 for basic detection. Although we do not plan to support python3 with all of our scripts (since Chromium does not) these simple cases can be fixed by using the function version of python's print. This patch also adds the Chromium source path to the core INCLUDEPATH so that Chromium headers are indexed as well. Change-Id: Ia6dec1c776fdcddf875fb8e814d8fb33b7340989 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update support for Shockwave Flash plugin.Paulo Pinheiro2015-04-161-0/+10
| | | | | | | | | | | | | | | | | | | | Add necessary support to make Flash plugin work properly and be able to navigate on urls and load fonts from system. Support for fullscreen mode still missing. Change-Id: Id948cde47b852332e1a4f5a73e781f01d27223f8 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* | Refactor FilePickerControllerAdam Kallai2015-03-051-0/+2
|/ | | | | | | | | Move FilePickerController classes to the QtWebEngine core to providing common functionality of files selecetion for WebEngine and WebEngineWidgtes. Change-Id: I6ab407095460ef5b63b454f7d62b98215383fc21 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Introduce a user scripts mechanismPierre Rossi2015-02-211-0/+8
| | | | | | | | | | | | | | | Allowing programmatic injection of JavaScript to accomplish all sorts of tasks on the render process side. This API gives control over the point during the loading phase at which the script is run, whether it is run on sub-frames or not, as well as the JavaScript world it is run in (either the page's main world, or an arbitrary isolated world). This only has the Widgets API. The Quick API, tests and docs are coming in separate patches Change-Id: Ia1c79f68f8dfd4d964281d9723d09062ed7abe46 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>