diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp index 13c62be36b3..bf30be935ce 100644 --- a/src/plugins/android/androidqtversionfactory.cpp +++ b/src/plugins/android/androidqtversionfactory.cpp @@ -30,8 +30,6 @@ #include #include -#include - namespace Android { namespace Internal { @@ -45,9 +43,6 @@ AndroidQtVersionFactory::AndroidQtVersionFactory(QObject *parent) QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) { - QFileInfo fi = qmakePath.toFileInfo(); - if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) - return nullptr; if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android")) && evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android")) return nullptr; diff --git a/src/plugins/ios/iosqtversionfactory.cpp b/src/plugins/ios/iosqtversionfactory.cpp index 14dc851dbdc..d03eee1e149 100644 --- a/src/plugins/ios/iosqtversionfactory.cpp +++ b/src/plugins/ios/iosqtversionfactory.cpp @@ -29,8 +29,6 @@ #include #include -#include - namespace Ios { namespace Internal { diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp index 96e582bf349..37b3b2098c1 100644 --- a/src/plugins/qnx/qnxqtversionfactory.cpp +++ b/src/plugins/qnx/qnxqtversionfactory.cpp @@ -26,13 +26,10 @@ #include "qnxqtversionfactory.h" #include "qnxconstants.h" -#include "qnxutils.h" #include "qnxqtversion.h" #include -#include - using namespace Qnx; using namespace Qnx::Internal; @@ -49,10 +46,6 @@ QtSupport::BaseQtVersion *QnxQtVersionFactory::create(const Utils::FileName &qma bool isAutoDetected, const QString &autoDetectionSource) { - QFileInfo fi = qmakePath.toFileInfo(); - if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) - return nullptr; - if (evaluator->contains(QLatin1String("QNX_CPUDIR"))) { return new QnxQtVersion(qmakePath, isAutoDetected, autoDetectionSource); } diff --git a/src/plugins/qtsupport/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp index 4d3504083d4..324c9704f70 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.cpp +++ b/src/plugins/qtsupport/desktopqtversionfactory.cpp @@ -27,8 +27,6 @@ #include "desktopqtversion.h" #include -#include - using namespace QtSupport; using namespace QtSupport::Internal; @@ -44,8 +42,5 @@ BaseQtVersion *DesktopQtVersionFactory::create(const Utils::FileName &qmakePath, { Q_UNUSED(evaluator); // we are the fallback :) so we don't care what kind of qt it is - QFileInfo fi = qmakePath.toFileInfo(); - if (fi.exists() && fi.isExecutable() && fi.isFile()) - return new DesktopQtVersion(qmakePath, isAutoDetected, autoDetectionSource); - return nullptr; + return new DesktopQtVersion(qmakePath, isAutoDetected, autoDetectionSource); } diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index e84c9356b89..ad16aa0ebdb 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -35,6 +35,8 @@ #include #include +#include + using namespace QtSupport; using namespace QtSupport::Internal; @@ -92,6 +94,10 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN return l->priority() > r->priority(); }); + QFileInfo fi = qmakePath.toFileInfo(); + if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) + return nullptr; + foreach (QtVersionFactory *factory, factories) { BaseQtVersion *ver = factory->create(qmakePath, &evaluator, isAutoDetected, autoDetectionSource); if (ver) { diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index 44cd8eddde9..44876f915c5 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -48,10 +48,6 @@ QtSupport::BaseQtVersion *EmbeddedLinuxQtVersionFactory::create(const Utils::Fil { Q_UNUSED(evaluator); - QFileInfo fi = qmakePath.toFileInfo(); - if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) - return nullptr; - auto version = new EmbeddedLinuxQtVersion(qmakePath, isAutoDetected, autoDetectionSource); QList abis = version->qtAbis(); diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp index 9fb10fca405..0f0adae9b90 100644 --- a/src/plugins/winrt/winrtqtversionfactory.cpp +++ b/src/plugins/winrt/winrtqtversionfactory.cpp @@ -30,8 +30,6 @@ #include -#include - namespace WinRt { namespace Internal { @@ -46,10 +44,6 @@ WinRtQtVersionFactory::WinRtQtVersionFactory(QObject *parent) QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) { - QFileInfo fi = qmakePath.toFileInfo(); - if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) - return nullptr; - foreach (const QString &value, evaluator->values(QLatin1String("QMAKE_PLATFORM"))) { if (value == QStringLiteral("winrt")) return new WinRtQtVersion(qmakePath, isAutoDetected, autoDetectionSource); @@ -71,10 +65,6 @@ WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory(QObject *parent) QtSupport::BaseQtVersion *WinRtPhoneQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) { - QFileInfo fi = qmakePath.toFileInfo(); - if (!fi.exists() || !fi.isExecutable() || !fi.isFile()) - return nullptr; - foreach (const QString &value, evaluator->values(QLatin1String("QMAKE_PLATFORM"))) { if (value == QStringLiteral("winphone")) return new WinRtPhoneQtVersion(qmakePath, isAutoDetected, autoDetectionSource);