diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /src/gui/vulkan/qvulkaninstance.cpp | |
parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'src/gui/vulkan/qvulkaninstance.cpp')
-rw-r--r-- | src/gui/vulkan/qvulkaninstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp index 8f364328d6..2e03be8151 100644 --- a/src/gui/vulkan/qvulkaninstance.cpp +++ b/src/gui/vulkan/qvulkaninstance.cpp @@ -808,7 +808,7 @@ QVulkanFunctions *QVulkanInstance::functions() const */ QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device) { - QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); + QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device]; if (!f) f = new QVulkanDeviceFunctions(this, device); return f; @@ -829,7 +829,7 @@ QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device) */ void QVulkanInstance::resetDeviceFunctions(VkDevice device) { - QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); + QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device]; delete f; f = nullptr; } |