Commit 3bc5d4c7 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

QtSupport: Remove unneeded #ifdef.



Get host OS at runtime.

Change-Id: Ib5757e9e147a252efc580614bb6257d04a7901f2
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 543ab54f
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/filesystemwatcher.h> #include <utils/filesystemwatcher.h>
#include <utils/hostosinfo.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -625,10 +626,10 @@ Utils::FileName QtVersionManager::findQMakeBinaryFromMakefile(const QString &mak ...@@ -625,10 +626,10 @@ Utils::FileName QtVersionManager::findQMakeBinaryFromMakefile(const QString &mak
qDebug()<<"#~~ QMAKE is:"<<r1.cap(1).trimmed(); qDebug()<<"#~~ QMAKE is:"<<r1.cap(1).trimmed();
QFileInfo qmake(r1.cap(1).trimmed()); QFileInfo qmake(r1.cap(1).trimmed());
QString qmakePath = qmake.filePath(); QString qmakePath = qmake.filePath();
#ifdef Q_OS_WIN if (Utils::HostOsInfo::isWindowsHost()
if (!qmakePath.endsWith(QLatin1String(".exe"))) && !qmakePath.endsWith(QLatin1String(".exe"))) {
qmakePath.append(QLatin1String(".exe")); qmakePath.append(QLatin1String(".exe"));
#endif }
// Is qmake still installed? // Is qmake still installed?
QFileInfo fi(qmakePath); QFileInfo fi(qmakePath);
if (fi.exists()) if (fi.exists())
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment