diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-17 01:00:21 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-17 10:19:22 +0200 |
| commit | 1783fca89768a9d503d886673643dc4542ec467f (patch) | |
| tree | 5055f39393017219e448ade71b3842896c4679c5 /src/platformsupport | |
| parent | b82648bd59256abb8e7084e0424a1f8a6a034c34 (diff) | |
| parent | 435d1d53bd61491010dbb2130a27e35cd9798965 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbintegration.cpp
Conflicts git missed:
src/plugins/platforms/qnx/qqnxglcontext.cpp
Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/kmsconvenience/qkmsdevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice.cpp b/src/platformsupport/kmsconvenience/qkmsdevice.cpp index 71422b469b..ef81f6162d 100644 --- a/src/platformsupport/kmsconvenience/qkmsdevice.cpp +++ b/src/platformsupport/kmsconvenience/qkmsdevice.cpp @@ -734,7 +734,7 @@ void QKmsDevice::enumerateProperties(drmModeObjectPropertiesPtr objProps, PropCa } else if (propTypeIs(prop, DRM_MODE_PROP_ENUM)) { qCDebug(qLcKmsDebug, " type is ENUM, value is %llu, possible values are:", value); for (int i = 0; i < prop->count_enums; ++i) - qCDebug(qLcKmsDebug, " enum %d: %s - %llu", i, prop->enums[i].name, prop->enums[i].value); + qCDebug(qLcKmsDebug, " enum %d: %s - %llu", i, prop->enums[i].name, quint64(prop->enums[i].value)); } else if (propTypeIs(prop, DRM_MODE_PROP_BITMASK)) { qCDebug(qLcKmsDebug, " type is BITMASK, value is %llu, possible bits are:", value); for (int i = 0; i < prop->count_enums; ++i) |