diff options
| author | Volker Hilsheimer <[email protected]> | 2024-07-16 11:46:39 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <[email protected]> | 2024-07-16 17:59:05 +0200 |
| commit | 1e1c68017338c89265d6664a27f4137fc8960473 (patch) | |
| tree | 360ae1bc38bf6185302d5d7e0b3ca930e058956c /src/gui/vulkan/qbasicvulkanplatforminstance.cpp | |
| parent | 6aa1cb05e357cf4221aaedd4cf742c45983af446 (diff) | |
Logging: use qCDebug/Warning/Info when for categorized logging
When building qt with QT_NO_DEBUG/WARNING/INFO_OUTPUT set, then the
qDebug/Warning/Info macros expand to `QMessageLogger::noDebug`. That
helper is not defined to take a logging category or category function,
so using `qDebug(lcX, ...)` breaks the build. The correct way to emit
categorized logging is to use the qCDebug/Warning/Info macros.
Task-number: QTBUG-125589
Pick-to: 6.8 6.7 6.5
Change-Id: I968b0e826871a09023c11fec9e51caa5a2c4dc0b
Reviewed-by: Jonas Karlsson <[email protected]>
Diffstat (limited to 'src/gui/vulkan/qbasicvulkanplatforminstance.cpp')
| -rw-r--r-- | src/gui/vulkan/qbasicvulkanplatforminstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp index 04ede49c39b..b6a820199c0 100644 --- a/src/gui/vulkan/qbasicvulkanplatforminstance.cpp +++ b/src/gui/vulkan/qbasicvulkanplatforminstance.cpp @@ -173,7 +173,7 @@ void QBasicPlatformVulkanInstance::init(QLibrary *lib) m_supportedExtensions.append(ext); } } - qDebug(lcPlatVk) << "Supported Vulkan instance extensions:" << m_supportedExtensions; + qCDebug(lcPlatVk) << "Supported Vulkan instance extensions:" << m_supportedExtensions; } QVulkanInfoVector<QVulkanLayer> QBasicPlatformVulkanInstance::supportedLayers() const @@ -248,13 +248,13 @@ void QBasicPlatformVulkanInstance::initInstance(QVulkanInstance *instance, const if (!m_supportedLayers.contains(layerName)) m_enabledLayers.removeAt(i--); } - qDebug(lcPlatVk) << "Enabling Vulkan instance layers:" << m_enabledLayers; + qCDebug(lcPlatVk) << "Enabling Vulkan instance layers:" << m_enabledLayers; for (int i = 0; i < m_enabledExtensions.size(); ++i) { const QByteArray &extName(m_enabledExtensions[i]); if (!m_supportedExtensions.contains(extName)) m_enabledExtensions.removeAt(i--); } - qDebug(lcPlatVk) << "Enabling Vulkan instance extensions:" << m_enabledExtensions; + qCDebug(lcPlatVk) << "Enabling Vulkan instance extensions:" << m_enabledExtensions; VkInstanceCreateInfo instInfo = {}; instInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; |
