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

Fixed "can not"

Browse Source 
Change-Id: I1ebfee92df0f4bd2e9520a4e831352b780d6b556
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Robert Loehning
2012-10-05 21:07:45 +02:00
parent f0e40373d2
commit bdceb60dd0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/api/plugin-specifications.qdoc
+1 -1
View File
@@ -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
src/plugins/projectexplorer/kitmanager.cpp
+2 -2
View File
@@ -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;
}