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

AutoTest: tr()-Fixes

Browse Source 
Do not use QObject::tr().

Change-Id: If92f36166f29defd3501410efeed8e6f68dc896d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Takumi ASAKI
2016-04-26 15:01:35 +09:00
committed by Christian Stenger
parent a320628245
commit 8d3e0a1017
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/autotest/testtreeitem.cpp
View File

@@ -68,14 +68,14 @@ QVariant TestTreeItem::data(int /*column*/, int role) const
switch (role) {
case Qt::DisplayRole:
if (m_type == Root && childCount() == 0)
return QString(m_name + QObject::tr(" (none)"));
return QString(m_name + QCoreApplication::translate("TestTreeItem", " (none)"));
else if (m_name.isEmpty())
return QObject::tr(Constants::UNNAMED_QUICKTESTS);
return QCoreApplication::translate("TestTreeItem", Constants::UNNAMED_QUICKTESTS);
else
return m_name;
case Qt::ToolTipRole:
if (m_type == TestCase && m_name.isEmpty()) {
return QObject::tr("<p>Give all test cases a name to ensure correct behavior "
return QCoreApplication::translate("TestTreeItem","<p>Give all test cases a name to ensure correct behavior "
"when running test cases and to be able to select them.</p>");
}
return m_filePath;
@@ -454,7 +454,8 @@ TestTreeItem *GoogleTestTreeItem::findChildByNameStateAndFile(const QString &nam
QString GoogleTestTreeItem::nameSuffix() const
{
static QString markups[] = { QObject::tr("parameterized"), QObject::tr("typed") };
static QString markups[] = { QCoreApplication::translate("GoogleTestTreeItem", "parameterized"),
QCoreApplication::translate("GoogleTestTreeItem", "typed") };
QString suffix;
if (m_state & Parameterized)
suffix = QLatin1String(" [") + markups[0];