diff --git a/doc/api/plugin-specifications.qdoc b/doc/api/plugin-specifications.qdoc index db2f43a77d9c696f4bd76110ebd5b2ac2f12a546..0f8a114ecf58cbe6958fd5790873c65a5b2fba9d 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 614c12d89a3a99cda822dc559a891eaf25847585..1e8a4dc3785aee8fbdbb3801004363750c1a99e3 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; }