From 05b3903b6a6a8d919ffe71473a3c3a2dce446e7d Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 17 May 2013 08:20:15 +0300
Subject: [PATCH] Environment: Move isEmpty() test to beginning
No reason to initialize a QFileInfo for an empty string
Change-Id: I537fc98e1a5dd2283db9e5e60717eb8873c02b13
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/libs/utils/environment.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index 3568363eec0..e0d03a9ab67 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -236,12 +236,12 @@ QString Environment::searchInDirectory(const QStringList &execs, QString directo
QString Environment::searchInPath(const QString &executable,
const QStringList &additionalDirs) const
{
- QString exec = QDir::cleanPath(expandVariables(executable));
- QFileInfo fi(exec);
-
if (executable.isEmpty())
return QString();
+ QString exec = QDir::cleanPath(expandVariables(executable));
+ QFileInfo fi(exec);
+
QStringList execs(exec);
if (HostOsInfo::isWindowsHost()) {
// Check all the executable extensions on windows:
--
GitLab