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

CMake: Fix UI text

Browse Source 
Change-Id: I3587084925089c7bb7ffb9cfb09f6b822b215cd8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Leena Miettinen
2017-10-20 14:58:40 +02:00
parent e174969c15
commit f4cd9cdb6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -300,7 +300,7 @@ void CMakeBuildStep::handleProjectWasParsed(QFutureInterface<bool> &fi, bool suc
if (success) { if (success) {
runImpl(fi); runImpl(fi);
} else { } else {
AbstractProcessStep::stdError(tr("Project did not parse successfully, can not build.")); AbstractProcessStep::stdError(tr("Project did not parse successfully, cannot build."));
reportRunResult(fi, false); reportRunResult(fi, false);
} }
} }

4
src/plugins/cmakeprojectmanager/configmodel.cpp
View File

@@ -362,7 +362,7 @@ QString ConfigModel::InternalDataItem::toolTip() const
tooltip << QCoreApplication::translate("CMakeProjectManager", "Not in CMakeCache.txt").arg(value); tooltip << QCoreApplication::translate("CMakeProjectManager", "Not in CMakeCache.txt").arg(value);
} }
if (!kitValue.isEmpty()) if (!kitValue.isEmpty())
tooltip << QCoreApplication::translate("CMakeProjectManager::ConfigModel", "Current Kit: %1").arg(kitValue); tooltip << QCoreApplication::translate("CMakeProjectManager::ConfigModel", "Current kit: %1").arg(kitValue);
return tooltip.join("<br>"); return tooltip.join("<br>");
} }
@@ -511,7 +511,7 @@ QString ConfigModelTreeItem::toolTip() const
QTC_ASSERT(dataItem, return QString()); QTC_ASSERT(dataItem, return QString());
QStringList tooltip(dataItem->description); QStringList tooltip(dataItem->description);
if (!dataItem->kitValue.isEmpty()) if (!dataItem->kitValue.isEmpty())
tooltip << QCoreApplication::translate("CMakeProjectManager", "Value requested by Kit: %1").arg(dataItem->kitValue); tooltip << QCoreApplication::translate("CMakeProjectManager", "Value requested by kit: %1").arg(dataItem->kitValue);
if (dataItem->inCMakeCache) { if (dataItem->inCMakeCache) {
if (dataItem->value != dataItem->newValue) if (dataItem->value != dataItem->newValue)
tooltip << QCoreApplication::translate("CMakeProjectManager", "Current CMake: %1").arg(dataItem->value); tooltip << QCoreApplication::translate("CMakeProjectManager", "Current CMake: %1").arg(dataItem->value);