diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /src/plugins/platforms/windows/qwindowskeymapper.cpp | |
parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'src/plugins/platforms/windows/qwindowskeymapper.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowskeymapper.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 334df17026..0b257cc48f 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -653,16 +653,20 @@ void QWindowsKeyMapper::updatePossibleKeyCodes(unsigned char *kbdBuffer, quint32 ::ToAscii(VK_SPACE, 0, emptyBuffer, reinterpret_cast<LPWORD>(&buffer), 0); ::ToAscii(vk_key, scancode, kbdBuffer, reinterpret_cast<LPWORD>(&buffer), 0); } - - if (QWindowsContext::verboseEvents > 1) { - qDebug("updatePossibleKeyCodes for virtual key = 0x%02x!", vk_key); + if (QWindowsContext::verbose > 1 && lcQpaEvents().isDebugEnabled()) { + QString message; + QDebug debug(&message); + debug <<__FUNCTION__ << " for virtual key = 0x" << hex << vk_key << dec<< '\n'; for (size_t i = 0; i < NumMods; ++i) { - qDebug(" [%d] (%d,0x%02x,'%c') %s", int(i), - keyLayout[vk_key].qtKey[i], - keyLayout[vk_key].qtKey[i], - keyLayout[vk_key].qtKey[i] ? keyLayout[vk_key].qtKey[i] : 0x03, - keyLayout[vk_key].deadkeys & (1<<i) ? "deadkey" : ""); + const quint32 qtKey = keyLayout[vk_key].qtKey[i]; + debug << " [" << i << "] (" << qtKey << ',' + << hex << showbase << qtKey << noshowbase << dec + << ",'" << char(qtKey ? qtKey : 0x03) << "')"; + if (keyLayout[vk_key].deadkeys & (1<<i)) + debug << " deadkey"; + debug << '\n'; } + qCDebug(lcQpaEvents) << message; } } |