Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
dt
2009-01-23 18:30:40 +01:00
6 changed files with 43 additions and 13 deletions

View File

@@ -913,8 +913,9 @@ void DebuggerPlugin::readSettings()
#if defined(Q_OS_WIN32)
defaultCommand.append(".exe");
#endif
QString defaultScript = ICore::instance()->resourcePath() +
QLatin1String("/gdb/qt4macros");
//QString defaultScript = ICore::instance()->resourcePath() +
// QLatin1String("/gdb/qt4macros");
QString defaultScript;
s->beginGroup(QLatin1String("DebugMode"));
QByteArray ba = s->value("State", QByteArray()).toByteArray();