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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
This commit is contained in:
Friedemann Kleint
2010-08-06 10:46:50 +02:00
parent 077c918186 9bad0c01be
commit 7e739985b2
24 changed files with 316 additions and 4399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/debuggeruiswitcher.cpp
View File

@@ -144,8 +144,13 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
delete d;
}
void DebuggerUISwitcher::addMenuAction(Core::Command *command,
const QString &langName, const QString &group)
QStringList DebuggerUISwitcher::supportedLanguages() const
{
return d->m_languages;
}
void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &langName,
const QString &group)
{
d->m_debugMenu->addAction(command, group);
d->m_menuCommands.insert(d->m_languages.indexOf(langName), command);