feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix warning

Browse Source 
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>
This commit is contained in:
Tobias Hunger
2011-08-31 11:56:29 +00:00
committed by Fawzi Mohamed
parent f44c9e26ed
commit eacb2e7263
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/dialogs/shortcutsettings.h
View File

@@ -97,6 +97,7 @@ private:
void handleKeyEvent(QKeyEvent *e); void handleKeyEvent(QKeyEvent *e);
int translateModifiers(Qt::KeyboardModifiers state, const QString &text); int translateModifiers(Qt::KeyboardModifiers state, const QString &text);
using Core::CommandMappings::markPossibleCollisions;
void markPossibleCollisions(ShortcutItem *); void markPossibleCollisions(ShortcutItem *);
void resetCollisionMarker(ShortcutItem *); void resetCollisionMarker(ShortcutItem *);
void resetCollisionMarkers(); void resetCollisionMarkers();