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

Debugger: Improve gdb binary settings handling.

Browse Source 
- Remove non-executable entries  on reading (check only
  absolute paths since path search is too expensive).
- Make sure gdb binary settings are not written out unless the
  user really changes them.

Reviewed-by: aep <arvid.picciani@nokia.com>
Acked-By: hjk
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
This commit is contained in:
Friedemann Kleint
2010-11-03 13:37:01 +01:00
parent 7a0e15b14e
commit 019be3e850
5 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/debugger/debuggeractions.cpp
View File

@@ -41,6 +41,7 @@
#include <QtCore/QDebug>
#include <QtCore/QVariant>
#include <QtCore/QSettings>
#include <QtCore/QFileInfo>
#include <QtGui/QAction>
#include <QtGui/QAbstractButton>
@@ -64,7 +65,7 @@ namespace Internal {
//////////////////////////////////////////////////////////////////////////
DebuggerSettings::DebuggerSettings(QObject *parent)
: QObject(parent)
: QObject(parent), m_gdbBinariesChanged(false)
{}
DebuggerSettings::~DebuggerSettings()
@@ -72,6 +73,17 @@ DebuggerSettings::~DebuggerSettings()
qDeleteAll(m_items);
}
DebuggerSettings::GdbBinaryToolChainMap DebuggerSettings::gdbBinaryToolChainMap() const
{
return m_gdbBinaryToolChainMap;
}
void DebuggerSettings::setGdbBinaryToolChainMap(const GdbBinaryToolChainMap &map)
{
m_gdbBinaryToolChainMap = map;
m_gdbBinariesChanged = true;
}
void DebuggerSettings::insertItem(int code, SavedAction *item)
{
QTC_ASSERT(!m_items.contains(code),
@@ -82,9 +94,22 @@ void DebuggerSettings::insertItem(int code, SavedAction *item)
}
void DebuggerSettings::readSettings(const QSettings *settings)
{
foreach (SavedAction *item, m_items)
item->readSettings(settings);
readGdbBinarySettings(settings);
}
void DebuggerSettings::writeSettings(QSettings *settings) const
{
foreach (SavedAction *item, m_items)
item->readSettings(settings);
item->writeSettings(settings);
if (m_gdbBinariesChanged)
writeGdbBinarySettings(settings);
}
void DebuggerSettings::readGdbBinarySettings(const QSettings *settings)
{
// Convert gdb binaries from flat settings list (see writeSettings)
// into map ("binary1=gdb,1,2", "binary2=symbian_gdb,3,4").
m_gdbBinaryToolChainMap.clear();
@@ -100,6 +125,16 @@ void DebuggerSettings::readSettings(const QSettings *settings)
if (tokens.size() < 2)
break;
const QString binary = tokens.front();
// Skip non-existent absolute binaries allowing for upgrades by the installer.
// Force a rewrite of the settings file.
const QFileInfo binaryInfo(binary);
if (binaryInfo.isAbsolute() && !binaryInfo.isExecutable()) {
m_gdbBinariesChanged = true;
const QString msg = QString::fromLatin1("Warning: The gdb binary '%1' does not exist, skipping.\n").arg(binary);
qWarning("%s", qPrintable(msg));
continue;
}
// Create entries for all toolchains.
tokens.pop_front();
foreach(const QString &t, tokens) {
// Paranoia: Check if the there is already a binary configured for the toolchain.
@@ -129,10 +164,8 @@ void DebuggerSettings::readSettings(const QSettings *settings)
#endif
}
void DebuggerSettings::writeSettings(QSettings *settings) const
void DebuggerSettings::writeGdbBinarySettings(QSettings *settings) const
{
foreach (SavedAction *item, m_items)
item->writeSettings(settings);
// Convert gdb binaries map into a flat settings list of
// ("binary1=gdb,1,2", "binary2=symbian_gdb,3,4"). It needs to be ASCII for installers
QString lastBinary;