summaryrefslogtreecommitdiff
path: root/src/plugins/cvs/cvsplugin.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-05-20 14:52:08 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-05-20 14:52:08 +0200
commit6383643d32e5666e7c12e05f40d9bfcb53f83e3e (patch)
treeec12afa344b999cfb259c201a083531fda050e45 /src/plugins/cvs/cvsplugin.cpp
parent4ed4535a5262361dcc7589f243fcf4cdfcca962e (diff)
downloadqt-creator-6383643d32e5666e7c12e05f40d9bfcb53f83e3e.tar.gz
VCS[Subversion/Perforce]: Fix VCSManager caching (Windows).
Ensure clean paths are returned by IVersionControl::findTopLevelForDirectory() as otherwise caching of VCSManager breaks (Windows) and commands are executed all over again. Fix display in SVN/CVS. Acked-by: con
Diffstat (limited to 'src/plugins/cvs/cvsplugin.cpp')
-rw-r--r--src/plugins/cvs/cvsplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index f1b21a4de6..1f7e646fe1 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -980,7 +980,8 @@ static inline QString msgExecutionLogEntry(const QString &workingDir, const QStr
const QString args = arguments.join(QString(QLatin1Char(' ')));
if (workingDir.isEmpty())
return CVSPlugin::tr("Executing: %1 %2\n").arg(executable, args);
- return CVSPlugin::tr("Executing in %1: %2 %3\n").arg(workingDir, executable, args);
+ return CVSPlugin::tr("Executing in %1: %2 %3\n").
+ arg(QDir::toNativeSeparators(workingDir), executable, args);
}
// Run CVS. At this point, file arguments must be relative to