diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
| commit | db4311d5b5786277c78c8840b8e16b334500856b (patch) | |
| tree | fdd10b093d403acc72018efba4051506a832fc6c /src/plugins/debugger/sourcefileshandler.cpp | |
| parent | d2bf853ca13854cee1757583cd8789741e3b8e18 (diff) | |
| parent | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (diff) | |
| download | qt-creator-db4311d5b5786277c78c8840b8e16b334500856b.tar.gz | |
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/sourcefileshandler.cpp')
| -rw-r--r-- | src/plugins/debugger/sourcefileshandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/sourcefileshandler.cpp b/src/plugins/debugger/sourcefileshandler.cpp index 50fb3289dd..cc75808f0f 100644 --- a/src/plugins/debugger/sourcefileshandler.cpp +++ b/src/plugins/debugger/sourcefileshandler.cpp @@ -60,8 +60,8 @@ QVariant SourceFilesHandler::headerData(int section, { if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { static QString headers[] = { - tr("Internal name") + QLatin1String(" "), - tr("Full name") + QLatin1String(" "), + tr("Internal Name") + QLatin1String(" "), + tr("Full Name") + QLatin1String(" "), }; return headers[section]; } |