diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-10 17:25:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-13 20:28:59 +0200 |
| commit | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (patch) | |
| tree | e4569500b0623856c77cf6f4ca591eb71fa3d49c /src/core/renderer | |
| parent | 83fa1d5f9b890ba251f7dc8f82acd950e9527343 (diff) | |
Fix Qt6 build
Fix Qt 6 incompatible source usages.
Also bump version.
Also make sure in a framework build, the process executable is placed
under the correct major version directory.
Also remove the ABI compatibility fixes that we did for malloc
symbols and friends.
Change-Id: Ie26f660502a20afd2a79334c9b4f07d9a14a1ed3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/renderer')
| -rw-r--r-- | src/core/renderer/user_resource_controller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp index be5e6f043..701614341 100644 --- a/src/core/renderer/user_resource_controller.cpp +++ b/src/core/renderer/user_resource_controller.cpp @@ -196,8 +196,8 @@ void UserResourceController::runScripts(UserScriptData::InjectionPoint p, blink: if (!renderView) return; - QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).toList(); - scriptsToRun.append(m_viewUserScriptMap.value(renderView).toList()); + QList<uint64_t> scriptsToRun = m_viewUserScriptMap.value(0).values(); + scriptsToRun.append(m_viewUserScriptMap.value(renderView).values()); for (uint64_t id : qAsConst(scriptsToRun)) { const UserScriptData &script = m_scripts.value(id); |