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

CMake: Fix grammar in warnings

Browse Source 
Change-Id: Iaadab95ffa102c02fe8de70b11dd1dd5ad224520
Reviewed-by: Aaron Barany <akb825@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Leena Miettinen
2016-07-25 15:27:18 +02:00
parent 6d3497d4e2
commit 3a9f242afe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -378,8 +378,8 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const
"even though the kit has no valid Qt version."), "even though the kit has no valid Qt version."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} else if (qmakePath != version->qmakeCommand()) { } else if (qmakePath != version->qmakeCommand()) {
result << Task(Task::Warning, tr("CMake configuration has a path to a qmake binary set, " result << Task(Task::Warning, tr("CMake configuration has a path to a qmake binary set "
"which does not match up with the qmake binary path " "that does not match the qmake binary path "
"configured in the Qt version."), "configured in the Qt version."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} }
@@ -398,8 +398,8 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const
"even though the kit has no valid tool chain."), "even though the kit has no valid tool chain."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} else if (tcCPath != tcC->compilerCommand()) { } else if (tcCPath != tcC->compilerCommand()) {
result << Task(Task::Warning, tr("CMake configuration has a path to a C compiler set, " result << Task(Task::Warning, tr("CMake configuration has a path to a C compiler set "
"that does not match up with the compiler path " "that does not match the compiler path "
"configured in the tool chain of the kit."), "configured in the tool chain of the kit."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} }
@@ -417,8 +417,8 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const
"even though the kit has no valid tool chain."), "even though the kit has no valid tool chain."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} else if (tcCxxPath != tcCxx->compilerCommand()) { } else if (tcCxxPath != tcCxx->compilerCommand()) {
result << Task(Task::Warning, tr("CMake configuration has a path to a C++ compiler set, " result << Task(Task::Warning, tr("CMake configuration has a path to a C++ compiler set "
"that does not match up with the compiler path " "that does not match the compiler path "
"configured in the tool chain of the kit."), "configured in the tool chain of the kit."),
Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM));
} }