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
This commit is contained in:
Eike Ziller
2012-08-23 15:52:15 +02:00
parent 888b7217cb 6a56990302
commit bc67246432
530 changed files with 9207 additions and 33307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,8 @@
**
**************************************************************************/
#define QT_NO_CAST_FROM_ASCII
#include "debuggeractions.h"
#include "debuggerconstants.h"
@@ -557,8 +559,9 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
item->setDefaultValue(true);
insertItem(ShowQmlObjectTree, item);
const QString qmlInspectorGroup = QLatin1String("QML.Inspector");
item = new SavedAction(this);
item->setSettingsKey("QML.Inspector", QLatin1String("QmlInspector.ShowAppOnTop"));
item->setSettingsKey(qmlInspectorGroup, QLatin1String("QmlInspector.ShowAppOnTop"));
item->setText(tr("Show Application On Top"));
item->setCheckable(true);
item->setDefaultValue(false);
@@ -566,7 +569,7 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
insertItem(ShowAppOnTop, item);
item = new SavedAction(this);
item->setSettingsKey("QML.Inspector", QLatin1String("QmlInspector.FromQml"));
item->setSettingsKey(qmlInspectorGroup, QLatin1String("QmlInspector.FromQml"));
item->setText(tr("Apply Changes on Save"));
item->setCheckable(true);
item->setDefaultValue(false);
@@ -617,7 +620,7 @@ QString DebuggerSettings::dump() const
const QString current = item->value().toString();
const QString default_ = item->defaultValue().toString();
ts << '\n' << key << ": " << current
<< " (default: " << default_ << ")";
<< " (default: " << default_ << ')';
if (current != default_)
ts << " ***";
}