From eacb2e726330c2c7f4f80df2988469a5d65488f9 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 31 Aug 2011 11:56:29 +0000
Subject: [PATCH] Fix warning

Do not hide symbols of base class

Change-Id: If35d662b0ce3680b0a46e47d55564d46c8740625
Reviewed-on: http://codereview.qt.nokia.com/3999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
---
 src/plugins/coreplugin/dialogs/shortcutsettings.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 703aaa87ddf..9040bd38adb 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -97,6 +97,7 @@ private:
 
     void handleKeyEvent(QKeyEvent *e);
     int translateModifiers(Qt::KeyboardModifiers state, const QString &text);
+    using Core::CommandMappings::markPossibleCollisions;
     void markPossibleCollisions(ShortcutItem *);
     void resetCollisionMarker(ShortcutItem *);
     void resetCollisionMarkers();