diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-31 17:39:49 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 12:42:05 +0200 |
commit | f3d047af903801d9e7705816df5299c4e04a76f4 (patch) | |
tree | 496e6ce90ef6d60be340f85414ffe640d97322b2 /src/qtdiag | |
parent | 6b2f32f3dc9de965801927a4bc5d970028a318a6 (diff) | |
download | qttools-f3d047af903801d9e7705816df5299c4e04a76f4.tar.gz |
Fix Qt6 buildwip/qt6
Fixes some unprefied textstream usages.
Bump the module version to 6.0.0.
Also windeployqt auto test is temporarily blacklisted because
with the current situation it's not possible to make it pass both
with a 5.x and a 6.x Qt build, and thus this would prevent a qt5.git
integration.
Change-Id: If750cf4f50ba4215cb63b53c42971f3d1f1c8160
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qtdiag')
-rw-r--r-- | src/qtdiag/qtdiag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 04cc72dfb..66d25bc64 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -247,9 +247,9 @@ void dumpVkInfo(QTextStream &str) window.setVulkanInstance(&inst); for (const VkPhysicalDeviceProperties &props : window.availablePhysicalDevices()) { str << " API version " << vulkanVersion(props.apiVersion).toString() - << hex << ", vendor 0x" << props.vendorID + << Qt::hex << ", vendor 0x" << props.vendorID << ", device 0x" << props.deviceID << ", " << props.deviceName - << dec << ", type " << props.deviceType + << Qt::dec << ", type " << props.deviceType << ", driver version " << vulkanVersion(props.driverVersion).toString(); } } else { |