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

Android: Use new setup for more plugin items

Browse Source 
Change-Id: Id5ff09813ab7b4be425d007abd4cc04d9c9472c1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-11-22 17:46:57 +01:00
parent 497b9b3c2c
commit 353c3cc930
17 changed files with 240 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,12 +38,10 @@
using namespace ProjectExplorer;
namespace Android {
namespace Internal {
namespace Android::Internal {
AndroidQtVersion::AndroidQtVersion()
: QtSupport::QtVersion()
, m_guard(std::make_unique<QObject>())
: m_guard(std::make_unique<QObject>())
{
QObject::connect(AndroidConfigurations::instance(),
&AndroidConfigurations::aboutToUpdate,
@@ -265,17 +263,26 @@ QSet<Utils::Id> AndroidQtVersion::targetDeviceTypes() const
// Factory
AndroidQtVersionFactory::AndroidQtVersionFactory()
class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
{
setQtVersionCreator([] { return new AndroidQtVersion; });
setSupportedType(Constants::ANDROID_QT_TYPE);
setPriority(90);
public:
AndroidQtVersionFactory()
{
setQtVersionCreator([] { return new AndroidQtVersion; });
setSupportedType(Constants::ANDROID_QT_TYPE);
setPriority(90);
setRestrictionChecker([](const SetupData &setup) {
return !setup.config.contains("android-no-sdk")
&& (setup.config.contains("android")
|| setup.platforms.contains("android"));
});
setRestrictionChecker([](const SetupData &setup) {
return !setup.config.contains("android-no-sdk")
&& (setup.config.contains("android")
|| setup.platforms.contains("android"));
});
}
};
void setupAndroidQtVersion()
{
static AndroidQtVersionFactory theAndroidQtVersionFactory;
}
#ifdef WITH_TESTS
@@ -341,5 +348,4 @@ void AndroidPlugin::testAndroidQtVersionParseBuiltWith()
}
#endif // WITH_TESTS
} // Internal
} // Android
} // Android::Internal