summaryrefslogtreecommitdiff
path: root/src/libs/utils/environment.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2012-03-22 11:27:30 +0100
committerTobias Hunger <tobias.hunger@nokia.com>2012-03-22 11:31:42 +0100
commite9e804888eb3330dae4144afb4026447895834a2 (patch)
treef96adcb3216ea638e012942b50c5eefd5ef74666 /src/libs/utils/environment.cpp
parent10478246a92e77dc79f2309b45572c5486128040 (diff)
downloadqt-creator-e9e804888eb3330dae4144afb4026447895834a2.tar.gz
Win: Avoid long creator startup times with '\' in PATH
Task-number: QTCREATORBUG-6501 Change-Id: Idfe050486db2d486e895bf6670cad3084871c44a Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/libs/utils/environment.cpp')
-rw-r--r--src/libs/utils/environment.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index 4390150f73..d6d0124d00 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -249,8 +249,11 @@ QString Environment::searchInPath(const QStringList &executables,
if (exec.indexOf(slash) != -1)
continue;
foreach (const QString &p, path()) {
- QString fp = p;
- fp += slash;
+ QString fp = QDir::fromNativeSeparators(p);
+ // Avoid turing / into // on windows which triggers windows to check
+ // for network drives!
+ if (!fp.endsWith(slash))
+ fp += slash;
fp += exec;
const QFileInfo fi(fp);
if (fi.exists() && fi.isExecutable() && !fi.isDir())