diff options
| author | con <qtc-committer@nokia.com> | 2009-10-29 18:54:17 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-29 18:54:17 +0100 |
| commit | be3fafc31167e9ae3b16d8d2361488fc7097191e (patch) | |
| tree | c1e28382252aba983b7e354d75101b63edc1fa40 /src/plugins/find/findplugin.cpp | |
| parent | c1413ffa8a4bbd7d762b2ec3982c55ccf5c9e30f (diff) | |
| parent | 2be0845c7492ad991f23ce5c90c322df788b62b5 (diff) | |
| download | qt-creator-be3fafc31167e9ae3b16d8d2361488fc7097191e.tar.gz | |
Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'
Conflicts:
src/plugins/projectexplorer/projectexplorer.h
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/plugins/find/findplugin.cpp')
| -rw-r--r-- | src/plugins/find/findplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 95327a29b2..03a51a94a9 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -191,7 +191,7 @@ void FindPlugin::setupFilterMenuItems() haveEnabledFilters = true; action->setEnabled(isEnabled); action->setData(qVariantFromValue(filter)); - cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->name(), globalcontext); + cmd = am->registerAction(action, QLatin1String("FindFilter.")+filter->id(), globalcontext); cmd->setDefaultKeySequence(filter->defaultShortcut()); mfind->addAction(cmd, Constants::G_FIND_FILTERS); m_filterActions.insert(filter, action); |