feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Drop one suite of QtVersion constructors

Browse Source 
Use default plus polish afterwards instead.

Change-Id: Ibd137562128445a5bae5aaa4fc5fcce2df6c3e38
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-02-14 10:28:20 +01:00
parent d9678ceb07
commit 66fd5abe58
30 changed files with 36 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidqtversion.cpp
View File

@@ -50,12 +50,6 @@ AndroidQtVersion::AndroidQtVersion()
{
}
AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path)
: QtSupport::BaseQtVersion(path)
{
setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false));
}
AndroidQtVersion *AndroidQtVersion::clone() const
{
return new AndroidQtVersion(*this);

1
src/plugins/android/androidqtversion.h
View File

@@ -38,7 +38,6 @@ class AndroidQtVersion : public QtSupport::BaseQtVersion
public:
AndroidQtVersion();
explicit AndroidQtVersion(const Utils::FileName &path);
AndroidQtVersion *clone() const override;
QString type() const override;

4
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -40,14 +40,14 @@ AndroidQtVersionFactory::AndroidQtVersionFactory()
setPriority(90);
}
QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator)
QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(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);
return new AndroidQtVersion;
}
} // Internal

3
src/plugins/android/androidqtversionfactory.h
View File

@@ -35,8 +35,7 @@ class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
public:
AndroidQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath,
ProFileEvaluator *evaluator) override;
QtSupport::BaseQtVersion *create(ProFileEvaluator *evaluator) override;
};
} // namespace Internal