From bdceb60dd0a020f12619d15c2df33e6bf618b53e Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Fri, 5 Oct 2012 21:07:45 +0200
Subject: [PATCH] Fixed "can not"
Change-Id: I1ebfee92df0f4bd2e9520a4e831352b780d6b556
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
---
doc/api/plugin-specifications.qdoc | 2 +-
src/plugins/projectexplorer/kitmanager.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/api/plugin-specifications.qdoc b/doc/api/plugin-specifications.qdoc
index db2f43a77d9..0f8a114ecf5 100644
--- a/doc/api/plugin-specifications.qdoc
+++ b/doc/api/plugin-specifications.qdoc
@@ -177,7 +177,7 @@
\list
\o If the dependency can be resolved, the plugin and
its dependency are loaded and initialized as for \c required dependencies.
- \o If the dependency can not be resolved, the plugin is loaded and initialized
+ \o If the dependency cannot be resolved, the plugin is loaded and initialized
as if the dependency was not declared at all.
\endlist
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 614c12d89a3..1e8a4dc3785 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -285,7 +285,7 @@ KitManager::KitList KitManager::restoreKits(const Utils::FileName &fileName)
PersistentSettingsReader reader;
if (!reader.load(fileName)) {
- qWarning("Warning: Failed to read \"%s\", can not restore kits!", qPrintable(fileName.toUserOutput()));
+ qWarning("Warning: Failed to read \"%s\", cannot restore kits!", qPrintable(fileName.toUserOutput()));
return result;
}
QVariantMap data = reader.restoreValues();
@@ -293,7 +293,7 @@ KitManager::KitList KitManager::restoreKits(const Utils::FileName &fileName)
// Check version:
int version = data.value(QLatin1String(KIT_FILE_VERSION_KEY), 0).toInt();
if (version < 1) {
- qWarning("Warning: Kit file version %d not supported, can not restore kits!", version);
+ qWarning("Warning: Kit file version %d not supported, cannot restore kits!", version);
return result;
}
--
GitLab