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

Windows build fix.

Browse Source 
Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Eike Ziller
2012-01-13 09:36:30 +01:00
committed by Friedemann Kleint
parent b49a817bfb
commit edcb065edb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/actionmanager/command.cpp
View File

@@ -118,7 +118,7 @@
*/
/*!
\fn void Command::setDefaultText(const QString &text)
\fn void Command::setDescription(const QString &text)
Set the \a text that is used to represent the Command in the
keyboard shortcut settings dialog. If you don't set this,
the current text from the user visible action is taken (which
@@ -126,9 +126,9 @@
*/
/*!
\fn QString Command::defaultText() const
\fn QString Command::description() const
Returns the text that is used to present this Command to the user.
\sa setDefaultText()
\sa setDescription()
*/
/*!

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -346,7 +346,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
QShortcut *sc = new QShortcut(parent);
cmd = am->registerShortcut(sc, Constants::CLOSE_ALTERNATIVE, editManagerContext);
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+F4")));
cmd->setDefaultText(EditorManager::tr("Close"));
cmd->setDescription(EditorManager::tr("Close"));
connect(sc, SIGNAL(activated()), this, SLOT(closeEditor()));
#endif

4
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -110,13 +110,13 @@ void RemoteLinuxPlugin::extensionsInitialized()
act = new QAction(tr("Start Remote Debug Server..."), 0);
cmd = am->registerAction(act, "StartGdbServer", globalcontext);
cmd->setDefaultText(tr("Start Gdbserver"));
cmd->setDescription(tr("Start Gdbserver"));
mstart->addAction(cmd, Debugger::Constants::G_MANUAL_REMOTE);
connect(act, SIGNAL(triggered()), SLOT(startGdbServer()));
act = new QAction(tr("Attach to Running Remote Process..."), 0);
cmd = am->registerAction(act, "AttachRemoteProcess", globalcontext);
cmd->setDefaultText(tr("Attach to Remote Process"));
cmd->setDescription(tr("Attach to Remote Process"));
mstart->addAction(cmd, Debugger::Constants::G_AUTOMATIC_REMOTE);
connect(act, SIGNAL(triggered()), SLOT(startGdbServer()));
*/