diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp index 0e680ad56e3..73f6f1e2280 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.cpp +++ b/src/plugins/cmakeprojectmanager/configmodel.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include @@ -602,7 +601,7 @@ QVariant ConfigModelTreeItem::data(int column, int role) const case Qt::DisplayRole: if (column == 0) return dataItem->key.isEmpty() - ? QCoreApplication::translate("CMakeProjectManager::ConfigModel", "") + ? ConfigModel::tr("") : dataItem->key; return value; case Qt::EditRole: @@ -688,33 +687,28 @@ QString ConfigModelTreeItem::toolTip() const if (!dataItem->description.isEmpty()) tooltip << dataItem->description; + const QString pattern = "

%1 %2

"; if (dataItem->isInitial) { if (!dataItem->kitValue.isEmpty()) - tooltip << QCoreApplication::translate("CMakeProjectManager", "

Kit: %1

") - .arg(dataItem->kitValue); + tooltip << pattern.arg(ConfigModel::tr("Kit:")).arg(dataItem->kitValue); - tooltip << QCoreApplication::translate("CMakeProjectManager", - "

Initial Configuration: %1

") - .arg(dataItem->currentValue()); + tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")).arg(dataItem->currentValue()); } else { - if (!dataItem->initialValue.isEmpty()) - tooltip << QCoreApplication::translate("CMakeProjectManager", - "

Initial Configuration: %1

") - .arg(dataItem->initialValue); + if (!dataItem->initialValue.isEmpty()) { + tooltip << pattern.arg(ConfigModel::tr("Initial Configuration:")) + .arg(dataItem->initialValue); + } if (dataItem->inCMakeCache) { - tooltip << QCoreApplication::translate("CMakeProjectManager", - "

Current Configuration: %1

") - .arg(dataItem->currentValue()); + tooltip << pattern.arg(ConfigModel::tr("Current Configuration:")) + .arg(dataItem->currentValue()); } else { - tooltip << QCoreApplication::translate("CMakeProjectManager", - "

Not in CMakeCache.txt

"); + tooltip << pattern.arg(ConfigModel::tr("Not in CMakeCache.txt")).arg(QString()); } } - tooltip << QCoreApplication::translate("CMakeProjectManager", - "

Type: %1

") - .arg(dataItem->typeDisplay()); - return tooltip.join(""); + tooltip << pattern.arg(ConfigModel::tr("Type:")).arg(dataItem->typeDisplay()); + + return tooltip.join(QString()); } QString ConfigModelTreeItem::currentValue() const