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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
This commit is contained in:
Eike Ziller
2011-08-16 10:21:55 +02:00
parent 5606b9d239 629de47f92
commit bf8cb5d4fc
25 changed files with 17345 additions and 2631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/externaltool.cpp
View File

@@ -45,6 +45,7 @@
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
#include <QtCore/QDir>
@@ -316,7 +317,8 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
}
} else {
if (*currentLocale < 0 && currentText->isEmpty()) {
*currentText = reader->readElementText();
*currentText = QCoreApplication::translate("Core::Internal::ExternalTool",
reader->readElementText().toLatin1().constData());
} else {
reader->skipCurrentElement();
}