forked from qt-creator/qt-creator
QtSupport: Drop one suite of QtVersion constructors
Use default plus polish afterwards instead. Change-Id: Ibd137562128445a5bae5aaa4fc5fcce2df6c3e38 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -42,12 +42,6 @@ using namespace ProjectExplorer;
|
||||
|
||||
IosQtVersion::IosQtVersion() = default;
|
||||
|
||||
IosQtVersion::IosQtVersion(const Utils::FileName &path)
|
||||
: QtSupport::BaseQtVersion(path)
|
||||
{
|
||||
setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false));
|
||||
}
|
||||
|
||||
IosQtVersion *IosQtVersion::clone() const
|
||||
{
|
||||
return new IosQtVersion(*this);
|
||||
|
||||
@@ -38,7 +38,6 @@ class IosQtVersion : public QtSupport::BaseQtVersion
|
||||
|
||||
public:
|
||||
IosQtVersion();
|
||||
explicit IosQtVersion(const Utils::FileName &path);
|
||||
|
||||
IosQtVersion *clone() const override;
|
||||
QString type() const override;
|
||||
|
||||
@@ -39,12 +39,11 @@ IosQtVersionFactory::IosQtVersionFactory()
|
||||
setPriority(90);
|
||||
}
|
||||
|
||||
QtSupport::BaseQtVersion *IosQtVersionFactory::create(const Utils::FileName &qmakePath,
|
||||
ProFileEvaluator *evaluator)
|
||||
QtSupport::BaseQtVersion *IosQtVersionFactory::create(ProFileEvaluator *evaluator)
|
||||
{
|
||||
if (!(evaluator->values(QLatin1String("QMAKE_PLATFORM")).contains(QLatin1String("ios"))))
|
||||
return nullptr;
|
||||
return new IosQtVersion(qmakePath);
|
||||
return new IosQtVersion;
|
||||
}
|
||||
|
||||
} // Internal
|
||||
|
||||
@@ -35,8 +35,7 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
|
||||
public:
|
||||
IosQtVersionFactory();
|
||||
|
||||
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath,
|
||||
ProFileEvaluator *evaluator) override;
|
||||
QtSupport::BaseQtVersion *create(ProFileEvaluator *evaluator) override;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
Reference in New Issue
Block a user