From 37a90653f925451161b9c005f4ddf7619186e0cb Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sat, 10 Sep 2016 22:58:14 +0300 Subject: [PATCH] Autotest: Replace macro usage with HostOsInfo Change-Id: I5f9626ff13d49611b2dd000ba0311823a18b5867 Reviewed-by: Christian Stenger --- src/plugins/autotest/testconfiguration.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp index 68a9b641689..1b392a5b4fb 100644 --- a/src/plugins/autotest/testconfiguration.cpp +++ b/src/plugins/autotest/testconfiguration.cpp @@ -273,17 +273,11 @@ QString TestConfiguration::executableFilePath() const return commandFileInfo.absoluteFilePath(); } else if (commandFileInfo.path() == "."){ QString fullCommandFileName = m_targetFile; - #ifdef Q_OS_WIN - if (!m_targetFile.endsWith(".exe")) + if (Utils::HostOsInfo::isWindowsHost() && !m_targetFile.endsWith(".exe")) fullCommandFileName = m_targetFile + QLatin1String(".exe"); - - static const QString separator(";"); - #else - static const QString separator(":"); - #endif // TODO: check if we can use searchInPath() from Utils::Environment - const QStringList &pathList - = m_environment.toProcessEnvironment().value("PATH").split(separator); + const QStringList &pathList = m_environment.toProcessEnvironment().value("PATH").split( + Utils::HostOsInfo::pathListSeparator()); foreach (const QString &path, pathList) { QString filePath(path + QDir::separator() + fullCommandFileName);