From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 17 Jan 2008 09:00:34 +0000 (+0000)
Subject: Do previous commit in a better way.
X-Git-Tag: 0.9.0-test0~3415
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6c8ee7e1db7082e4eed1656e96a8c6f339147428;p=vlc

Do previous commit in a better way.
---

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 3a3675062e..d957344a91 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1205,7 +1205,12 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
 void KeyInputDialog::keyPressEvent( QKeyEvent *e )
 {
     if( e->key() == Qt::Key_Tab ||
-        ( e->modifiers() > 0 && e->modifiers() != Qt::KeypadModifier ) ) return;
+        e->key() == Qt::Key_Shift ||
+        e->key() == Qt::Key_Control ||
+        e->key() == Qt::Key_Meta ||
+        e->key() == Qt::Key_Alt ||
+        e->key() == Qt::Key_AltGr )
+        return;
     int i_vlck = qtEventToVLCKey( e );
     selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
     checkForConflicts( i_vlck );