diff options
30 files changed, 62 insertions, 78 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 9916fc1deb..35a0b53f82 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -50,8 +50,8 @@ AndroidQtVersion::AndroidQtVersion() { } -AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) - : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource) +AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path) + : QtSupport::BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index d009c68ceb..bb5b2d7487 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -38,7 +38,7 @@ class AndroidQtVersion : public QtSupport::BaseQtVersion public: AndroidQtVersion(); - AndroidQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); + explicit AndroidQtVersion(const Utils::FileName &path); AndroidQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp index b3e5863601..e15ca0693f 100644 --- a/src/plugins/android/androidqtversionfactory.cpp +++ b/src/plugins/android/androidqtversionfactory.cpp @@ -40,14 +40,14 @@ AndroidQtVersionFactory::AndroidQtVersionFactory() setPriority(90); } -QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) +QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator) { if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android")) && evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android")) return nullptr; if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android-no-sdk"))) return nullptr; - return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new AndroidQtVersion(qmakePath); } } // Internal diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h index 789db4c290..3af4edc514 100644 --- a/src/plugins/android/androidqtversionfactory.h +++ b/src/plugins/android/androidqtversionfactory.h @@ -35,8 +35,8 @@ class AndroidQtVersionFactory : public QtSupport::QtVersionFactory public: AndroidQtVersionFactory(); - QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override; + QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator) override; }; } // namespace Internal diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index 7b83b6b5ea..23a52a2578 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -42,9 +42,8 @@ using namespace ProjectExplorer; IosQtVersion::IosQtVersion() = default; -IosQtVersion::IosQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource) - : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource) +IosQtVersion::IosQtVersion(const Utils::FileName &path) + : QtSupport::BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h index 6d4a093ba5..a747000d55 100644 --- a/src/plugins/ios/iosqtversion.h +++ b/src/plugins/ios/iosqtversion.h @@ -38,8 +38,7 @@ class IosQtVersion : public QtSupport::BaseQtVersion public: IosQtVersion(); - IosQtVersion(const Utils::FileName &path, bool isAutodetected = false, - const QString &autodetectionSource = QString()); + explicit IosQtVersion(const Utils::FileName &path); IosQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/ios/iosqtversionfactory.cpp b/src/plugins/ios/iosqtversionfactory.cpp index 99ca2b51ad..0fc3775efc 100644 --- a/src/plugins/ios/iosqtversionfactory.cpp +++ b/src/plugins/ios/iosqtversionfactory.cpp @@ -40,13 +40,11 @@ IosQtVersionFactory::IosQtVersionFactory() } QtSupport::BaseQtVersion *IosQtVersionFactory::create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, - bool isAutoDetected, - const QString &autoDetectionSource) + ProFileEvaluator *evaluator) { if (!(evaluator->values(QLatin1String("QMAKE_PLATFORM")).contains(QLatin1String("ios")))) return nullptr; - return new IosQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new IosQtVersion(qmakePath); } } // Internal diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h index 230fd28f4f..8c093d7cb3 100644 --- a/src/plugins/ios/iosqtversionfactory.h +++ b/src/plugins/ios/iosqtversionfactory.h @@ -35,9 +35,8 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory public: IosQtVersionFactory(); - QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, - const QString &autoDetectionSource = QString()) override; + QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator) override; }; } // namespace Internal diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp index 7e8540139b..19f2b9fa4c 100644 --- a/src/plugins/qnx/qnxqtversion.cpp +++ b/src/plugins/qnx/qnxqtversion.cpp @@ -46,9 +46,8 @@ static char SDP_PATH_KEY[] = "SDKPath"; QnxQtVersion::QnxQtVersion() = default; -QnxQtVersion::QnxQtVersion(const Utils::FileName &path, bool isAutoDetected, - const QString &autoDetectionSource) : - QtSupport::BaseQtVersion(path, isAutoDetected, autoDetectionSource) +QnxQtVersion::QnxQtVersion(const Utils::FileName &path) : + QtSupport::BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h index 6bea0ed4b1..22ab58c935 100644 --- a/src/plugins/qnx/qnxqtversion.h +++ b/src/plugins/qnx/qnxqtversion.h @@ -39,9 +39,8 @@ class QnxQtVersion : public QtSupport::BaseQtVersion { public: QnxQtVersion(); - QnxQtVersion(const Utils::FileName &path, - bool isAutoDetected = false, - const QString &autoDetectionSource = QString()); + explicit QnxQtVersion(const Utils::FileName &path); + QnxQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp index 5d2a23d7e7..283a8a52af 100644 --- a/src/plugins/qnx/qnxqtversionfactory.cpp +++ b/src/plugins/qnx/qnxqtversionfactory.cpp @@ -41,12 +41,10 @@ QnxQtVersionFactory::QnxQtVersionFactory() } QtSupport::BaseQtVersion *QnxQtVersionFactory::create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, - bool isAutoDetected, - const QString &autoDetectionSource) + ProFileEvaluator *evaluator) { if (evaluator->contains(QLatin1String("QNX_CPUDIR"))) { - return new QnxQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new QnxQtVersion(qmakePath); } return nullptr; diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h index 8c842af9ed..f3052a720f 100644 --- a/src/plugins/qnx/qnxqtversionfactory.h +++ b/src/plugins/qnx/qnxqtversionfactory.h @@ -36,9 +36,7 @@ public: QnxQtVersionFactory(); QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, - bool isAutoDetected = false, - const QString &autoDetectionSource = QString()) override; + ProFileEvaluator *evaluator) override; }; } // namespace Internal diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index ecef52c9d1..cb24af7b9b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -193,10 +193,8 @@ bool QtVersionNumber::operator >=(const QtVersionNumber &b) const // BaseQtVersion /////////////// -BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected, const QString &autodetectionSource) +BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand) : m_id(QtVersionManager::getUniqueId()), - m_isAutodetected(isAutodetected), - m_autodetectionSource(autodetectionSource), m_qmakeCommand(qmakeCommand) { } BaseQtVersion::BaseQtVersion(const BaseQtVersion &other) = default; @@ -498,6 +496,11 @@ void BaseQtVersion::setId(int id) m_id = id; } +void BaseQtVersion::setIsAutodetected(bool isAutodetected) +{ + m_isAutodetected = isAutodetected; +} + void BaseQtVersion::fromMap(const QVariantMap &map) { m_id = map.value(Constants::QTVERSIONID).toInt(); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 92c502f2b9..489374899d 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -253,10 +253,12 @@ public: const ProjectExplorer::Target *target); QSet<Core::Id> features() const; + void setIsAutodetected(bool isAutodetected); + protected: virtual QSet<Core::Id> availableFeatures() const; BaseQtVersion(); - BaseQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); + explicit BaseQtVersion(const Utils::FileName &path); BaseQtVersion(const BaseQtVersion &other); virtual QList<ProjectExplorer::Task> reportIssuesImpl(const QString &proFile, const QString &buildDir) const; diff --git a/src/plugins/qtsupport/desktopqtversion.cpp b/src/plugins/qtsupport/desktopqtversion.cpp index e70cf84e0e..34215812fe 100644 --- a/src/plugins/qtsupport/desktopqtversion.cpp +++ b/src/plugins/qtsupport/desktopqtversion.cpp @@ -46,8 +46,8 @@ DesktopQtVersion::DesktopQtVersion() } -DesktopQtVersion::DesktopQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) - : BaseQtVersion(path, isAutodetected, autodetectionSource) +DesktopQtVersion::DesktopQtVersion(const Utils::FileName &path) + : BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/qtsupport/desktopqtversion.h b/src/plugins/qtsupport/desktopqtversion.h index 2ab966bc24..8801333004 100644 --- a/src/plugins/qtsupport/desktopqtversion.h +++ b/src/plugins/qtsupport/desktopqtversion.h @@ -33,7 +33,7 @@ class QTSUPPORT_EXPORT DesktopQtVersion : public BaseQtVersion { public: DesktopQtVersion(); - DesktopQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); + explicit DesktopQtVersion(const Utils::FileName &path); DesktopQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/qtsupport/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp index 5f27d5c250..f8f51da0da 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.cpp +++ b/src/plugins/qtsupport/desktopqtversionfactory.cpp @@ -37,9 +37,9 @@ DesktopQtVersionFactory::DesktopQtVersionFactory() setPriority(0); // Lowest of all, we want to be the fallback } -BaseQtVersion *DesktopQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) +BaseQtVersion *DesktopQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator) { Q_UNUSED(evaluator); // we are the fallback :) so we don't care what kind of qt it is - return new DesktopQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new DesktopQtVersion(qmakePath); } diff --git a/src/plugins/qtsupport/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h index c650019fcb..1ef146b912 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.h +++ b/src/plugins/qtsupport/desktopqtversionfactory.h @@ -35,8 +35,7 @@ class DesktopQtVersionFactory : public QtVersionFactory public: DesktopQtVersionFactory(); - BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override; + BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator) override; }; } // Internal diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index 2337adaeec..05c1069cb4 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -98,8 +98,9 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN return nullptr; foreach (QtVersionFactory *factory, factories) { - BaseQtVersion *ver = factory->create(qmakePath, &evaluator, isAutoDetected, autoDetectionSource); - if (ver) { + if (BaseQtVersion *ver = factory->create(qmakePath, &evaluator)) { + ver->setAutoDetectionSource(autoDetectionSource); + ver->setIsAutodetected(isAutoDetected); ProFileCacheManager::instance()->decRefCount(); return ver; } diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index 8ae0926a19..c894689b3e 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -55,9 +55,7 @@ public: /// the desktop factory claims to handle all paths int priority() const { return m_priority; } virtual BaseQtVersion *create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, - bool isAutoDetected = false, - const QString &autoDetectionSource = QString()) = 0; + ProFileEvaluator *evaluator) = 0; static BaseQtVersion *createQtVersionFromQMakePath( const Utils::FileName &qmakePath, bool isAutoDetected = false, diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index 1aad59919c..9f0e6e685d 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -35,9 +35,8 @@ namespace RemoteLinux { namespace Internal { -EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource) - : BaseQtVersion(path, isAutodetected, autodetectionSource) +EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path) + : BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h index f9b823e428..c1ef9ac3ab 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h @@ -34,8 +34,8 @@ class EmbeddedLinuxQtVersion : public QtSupport::BaseQtVersion { public: EmbeddedLinuxQtVersion() = default; - EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected = false, - const QString &autodetectionSource = QString()); + explicit EmbeddedLinuxQtVersion(const Utils::FileName &path); + EmbeddedLinuxQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index 74d5d1a1ea..a768338fb1 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -41,13 +41,11 @@ EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory() } QtSupport::BaseQtVersion *EmbeddedLinuxQtVersionFactory::create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, - bool isAutoDetected, - const QString &autoDetectionSource) + ProFileEvaluator *evaluator) { Q_UNUSED(evaluator); - auto version = new EmbeddedLinuxQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + auto version = new EmbeddedLinuxQtVersion(qmakePath); QList<ProjectExplorer::Abi> abis = version->qtAbis(); // Note: This fails for e.g. intel/meego cross builds on x86 linux machines. diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h index e73ef8f6e7..0bfac1d7b7 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h @@ -35,9 +35,8 @@ class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory public: EmbeddedLinuxQtVersionFactory(); - QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, - const QString &autoDetectionSource = QString()) override; + QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator) override; }; } // Internal diff --git a/src/plugins/winrt/winrtphoneqtversion.cpp b/src/plugins/winrt/winrtphoneqtversion.cpp index e3e2aa65e5..c7dd1658c6 100644 --- a/src/plugins/winrt/winrtphoneqtversion.cpp +++ b/src/plugins/winrt/winrtphoneqtversion.cpp @@ -35,9 +35,8 @@ namespace WinRt { namespace Internal { -WinRtPhoneQtVersion::WinRtPhoneQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource) - : WinRtQtVersion(path, isAutodetected, autodetectionSource) +WinRtPhoneQtVersion::WinRtPhoneQtVersion(const Utils::FileName &path) + : WinRtQtVersion(path) { } diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h index 44ec105bb6..7c2626f061 100644 --- a/src/plugins/winrt/winrtphoneqtversion.h +++ b/src/plugins/winrt/winrtphoneqtversion.h @@ -35,8 +35,7 @@ class WinRtPhoneQtVersion : public WinRtQtVersion Q_DECLARE_TR_FUNCTIONS(WinRt::Internal::WinRtQtVersion) public: WinRtPhoneQtVersion() = default; - WinRtPhoneQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource); + explicit WinRtPhoneQtVersion(const Utils::FileName &path); QString description() const override; BaseQtVersion *clone() const override; diff --git a/src/plugins/winrt/winrtqtversion.cpp b/src/plugins/winrt/winrtqtversion.cpp index 082eafd1e9..cff8c9b7c7 100644 --- a/src/plugins/winrt/winrtqtversion.cpp +++ b/src/plugins/winrt/winrtqtversion.cpp @@ -33,9 +33,8 @@ namespace WinRt { namespace Internal { -WinRtQtVersion::WinRtQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource) - : BaseQtVersion(path, isAutodetected, autodetectionSource) +WinRtQtVersion::WinRtQtVersion(const Utils::FileName &path) + : BaseQtVersion(path) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h index f743c3dfcc..d45b1b7504 100644 --- a/src/plugins/winrt/winrtqtversion.h +++ b/src/plugins/winrt/winrtqtversion.h @@ -35,8 +35,7 @@ class WinRtQtVersion : public QtSupport::BaseQtVersion Q_DECLARE_TR_FUNCTIONS(WinRt::Internal::WinRtQtVersion) public: WinRtQtVersion() = default; - WinRtQtVersion(const Utils::FileName &path, bool isAutodetected, - const QString &autodetectionSource); + explicit WinRtQtVersion(const Utils::FileName &path); BaseQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp index c2b08aef8c..f25a73c102 100644 --- a/src/plugins/winrt/winrtqtversionfactory.cpp +++ b/src/plugins/winrt/winrtqtversionfactory.cpp @@ -41,11 +41,11 @@ WinRtQtVersionFactory::WinRtQtVersionFactory() } QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) + ProFileEvaluator *evaluator) { foreach (const QString &value, evaluator->values(QLatin1String("QMAKE_PLATFORM"))) { if (value == QStringLiteral("winrt")) - return new WinRtQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new WinRtQtVersion(qmakePath); } return nullptr; @@ -61,11 +61,11 @@ WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory() } QtSupport::BaseQtVersion *WinRtPhoneQtVersionFactory::create(const Utils::FileName &qmakePath, - ProFileEvaluator *evaluator, bool isAutoDetected, const QString &autoDetectionSource) + ProFileEvaluator *evaluator) { foreach (const QString &value, evaluator->values(QLatin1String("QMAKE_PLATFORM"))) { if (value == QStringLiteral("winphone")) - return new WinRtPhoneQtVersion(qmakePath, isAutoDetected, autoDetectionSource); + return new WinRtPhoneQtVersion(qmakePath); } return nullptr; diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h index e3e93dfc23..249b3ee8c1 100644 --- a/src/plugins/winrt/winrtqtversionfactory.h +++ b/src/plugins/winrt/winrtqtversionfactory.h @@ -35,8 +35,8 @@ class WinRtQtVersionFactory : public QtSupport::QtVersionFactory public: WinRtQtVersionFactory(); - QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, const QString &autoDetectionSource = QString()); + QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator) override; }; class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory @@ -44,8 +44,8 @@ class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory public: WinRtPhoneQtVersionFactory(); - QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator, - bool isAutoDetected = false, const QString &autoDetectionSource = QString()); + QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, + ProFileEvaluator *evaluator) override; }; } // Internal |