From 3e2f32547de39133d8c4e2d2f70ed2254b2bcc76 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Tue, 3 Jan 2012 13:34:49 +0100
Subject: If decodestring can't translate the string return Qt::Key_unknown.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie082b326e944a28b4e29984a527e3841a05b32f6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/gui/kernel/qkeysequence.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/gui/kernel')

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 4f6eba2f88..986701bd7b 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1316,6 +1316,9 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
             if (found)
                 break;
         }
+        // We couldn't translate the key.
+        if (!found)
+            return Qt::Key_unknown;
     }
     return ret;
 }
-- 
cgit v1.2.3