summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2010-04-01 21:29:51 +0200
committerMorten Johan Sorvig <morten.sorvig@nokia.com>2010-04-01 21:29:51 +0200
commita100954c3f1851bdf562ffbc9c688ff110cfb488 (patch)
treef68c5993d7dbe31cefe7e3c0e9205787e5c2922d
parent465bd49ef6b2d5c9a09264594dfcc7483703831b (diff)
Use the current key when sending non-alphanumretic
key events.
-rw-r--r--src/gui/kernel/qeventdispatcher_pepper.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qeventdispatcher_pepper.cpp b/src/gui/kernel/qeventdispatcher_pepper.cpp
index 7aab111f34..94353430f1 100644
--- a/src/gui/kernel/qeventdispatcher_pepper.cpp
+++ b/src/gui/kernel/qeventdispatcher_pepper.cpp
@@ -415,20 +415,19 @@ void QEventDispatcherPepper::processKeyEvent(NPKeyEvent *keyEvent, uint32 eventT
*/
Qt::KeyboardModifiers modifiers = pepperKeyModifiersToQt(keyEvent->modifier);
bool alphanumretic;
- Qt::Key key = pepperKeyToQt(currentPepperKey, &alphanumretic);
+ Qt::Key key = pepperKeyToQt(keyEvent->normalizedKeyCode, &alphanumretic);
if (eventType == NPEventType_KeyDown) {
currentPepperKey = keyEvent->normalizedKeyCode;
if (!alphanumretic) {
QKeyEvent qtKeyEvent(QEvent::KeyPress, key, modifiers, QString());
QApplicationPrivate::handleKeyEvent(0, &qtKeyEvent);
- qDebug() << "Key Down" << keyEvent->normalizedKeyCode << hex << modifiers;
+ //qDebug() << "send Key Down" << keyEvent->normalizedKeyCode << hex << modifiers;
}
- // qDebug() << "Key Down" << key->normalizedKeyCode << hex << modifiers;
}
if (eventType == NPEventType_KeyUp) {
- // qDebug() << "Key Up" << key->normalizedKeyCode << hex << modifiers;
+ //qDebug() << "send Key Up" << keyEvent->normalizedKeyCode << hex << modifiers;
QKeyEvent keyEvent(QEvent::KeyRelease, key, modifiers, QString());
QApplicationPrivate::handleKeyEvent(0, &keyEvent);
}