diff options
author | Eike Ziller <[email protected]> | 2012-10-04 12:23:39 +0200 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2012-10-04 12:23:39 +0200 |
commit | db4311d5b5786277c78c8840b8e16b334500856b (patch) | |
tree | fdd10b093d403acc72018efba4051506a832fc6c /src/plugins/debugger/moduleshandler.cpp | |
parent | d2bf853ca13854cee1757583cd8789741e3b8e18 (diff) | |
parent | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (diff) |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
dist/gdb/Makefile.osx
src/libs/qmldebug/qmldebug.qbs
src/plugins/android/androidsettingswidget.cpp
Change-Id: I85627130b575f7d08f416dea52031fa72019b217
Diffstat (limited to 'src/plugins/debugger/moduleshandler.cpp')
-rw-r--r-- | src/plugins/debugger/moduleshandler.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp index 10786d29dff..890146f0512 100644 --- a/src/plugins/debugger/moduleshandler.cpp +++ b/src/plugins/debugger/moduleshandler.cpp @@ -80,12 +80,12 @@ QVariant ModulesModel::headerData(int section, { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { static QString headers[] = { - ModulesHandler::tr("Module name") + QLatin1String(" "), - ModulesHandler::tr("Module path") + QLatin1String(" "), - ModulesHandler::tr("Symbols read") + QLatin1String(" "), - ModulesHandler::tr("Symbols type") + QLatin1String(" "), - ModulesHandler::tr("Start address") + QLatin1String(" "), - ModulesHandler::tr("End address") + QLatin1String(" ") + ModulesHandler::tr("Module Name") + QLatin1String(" "), + ModulesHandler::tr("Module Path") + QLatin1String(" "), + ModulesHandler::tr("Symbols Read") + QLatin1String(" "), + ModulesHandler::tr("Symbols Type") + QLatin1String(" "), + ModulesHandler::tr("Start Address") + QLatin1String(" "), + ModulesHandler::tr("End Address") + QLatin1String(" ") }; return headers[section]; } @@ -123,22 +123,22 @@ QVariant ModulesModel::data(const QModelIndex &index, int role) const case 2: if (role == Qt::DisplayRole) switch (module.symbolsRead) { - case Module::UnknownReadState: return ModulesHandler::tr("unknown"); - case Module::ReadFailed: return ModulesHandler::tr("no"); - case Module::ReadOk: return ModulesHandler::tr("yes"); + case Module::UnknownReadState: return ModulesHandler::tr("Unknown"); + case Module::ReadFailed: return ModulesHandler::tr("No"); + case Module::ReadOk: return ModulesHandler::tr("Yes"); } break; case 3: if (role == Qt::DisplayRole) switch (module.elfData.symbolsType) { case UnknownSymbols: - return ModulesHandler::tr("unknown"); + return ModulesHandler::tr("Unknown"); case NoSymbols: - return ModulesHandler::tr("none"); + return ModulesHandler::tr("None"); case PlainSymbols: - return ModulesHandler::tr("plain"); + return ModulesHandler::tr("Plain"); case FastSymbols: - return ModulesHandler::tr("fast"); + return ModulesHandler::tr("Fast"); case LinkedSymbols: return ModulesHandler::tr("debuglnk"); case BuildIdSymbols: |