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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
This commit is contained in:
Eike Ziller
2012-10-04 12:23:39 +02:00
parent d2bf853ca1 ed86a7ca58
commit db4311d5b5
110 changed files with 2246 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -221,7 +221,7 @@ public:
QAction *createAction(QObject *parent) const
{
QAction *action = new QAction(DebuggerPlugin::tr("Install &Debug Information"), parent);
action->setToolTip(DebuggerPlugin::tr("This tries to install missing debug information."));
action->setToolTip(DebuggerPlugin::tr("Tries to install missing debug information."));
return action;
}
@@ -302,7 +302,7 @@ QString GdbEngine::errorMessage(QProcess::ProcessError error)
switch (error) {
case QProcess::FailedToStart:
return tr("The gdb process failed to start. Either the "
"invoked program '%1' is missing, or you may have insufficient "
"invoked program \"%1\" is missing, or you may have insufficient "
"permissions to invoke the program.\n%2")
.arg(m_gdb, gdbProc()->errorString());
case QProcess::Crashed:
@@ -1053,7 +1053,7 @@ void GdbEngine::commandTimeout()
"to a command within %n second(s). This could mean it is stuck "
"in an endless loop or taking longer than expected to perform "
"the operation.\nYou can choose between waiting "
"longer or abort debugging.", 0, timeOut / 1000);
"longer or aborting debugging.", 0, timeOut / 1000);
QMessageBox *mb = showMessageBox(QMessageBox::Critical,
tr("GDB not responding"), msg,
QMessageBox::Ok | QMessageBox::Cancel);
@@ -2095,7 +2095,7 @@ int GdbEngine::currentFrame() const
static QString msgNoGdbBinaryForToolChain(const Abi &tc)
{
return GdbEngine::tr("There is no gdb binary available for binaries in format '%1'")
return GdbEngine::tr("There is no GDB binary available for binaries in format '%1'")
.arg(tc.toString());
}