forked from qt-creator/qt-creator
Android: Silence soft assert
Android toolchains need a fully loaded Qt version manager. Change-Id: Icf3ae7d79923b438047b87cbb400d0b8a341914e Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -180,7 +180,10 @@ void AndroidPlugin::kitsRestored()
|
|||||||
AndroidConfigurations::registerNewToolChains();
|
AndroidConfigurations::registerNewToolChains();
|
||||||
AndroidConfigurations::updateAutomaticKitList();
|
AndroidConfigurations::updateAutomaticKitList();
|
||||||
connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
|
connect(QtSupport::QtVersionManager::instance(), &QtSupport::QtVersionManager::qtVersionsChanged,
|
||||||
AndroidConfigurations::instance(), &AndroidConfigurations::updateAutomaticKitList);
|
AndroidConfigurations::instance(), []() {
|
||||||
|
AndroidConfigurations::registerNewToolChains();
|
||||||
|
AndroidConfigurations::updateAutomaticKitList();
|
||||||
|
});
|
||||||
disconnect(KitManager::instance(), &KitManager::kitsLoaded,
|
disconnect(KitManager::instance(), &KitManager::kitsLoaded,
|
||||||
this, &AndroidPlugin::kitsRestored);
|
this, &AndroidPlugin::kitsRestored);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -169,11 +169,6 @@ AndroidToolChainFactory::AndroidToolChainFactory()
|
|||||||
setToolchainConstructor([] { return new AndroidToolChain; });
|
setToolchainConstructor([] { return new AndroidToolChain; });
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolChainList AndroidToolChainFactory::autoDetect(const ToolChainList &alreadyKnown)
|
|
||||||
{
|
|
||||||
return autodetectToolChains(alreadyKnown);
|
|
||||||
}
|
|
||||||
|
|
||||||
static FilePath clangPlusPlusPath(const FilePath &clangPath)
|
static FilePath clangPlusPlusPath(const FilePath &clangPath)
|
||||||
{
|
{
|
||||||
return clangPath.parentDir().pathAppended(
|
return clangPath.parentDir().pathAppended(
|
||||||
|
|||||||
@@ -67,8 +67,6 @@ class AndroidToolChainFactory : public ProjectExplorer::ToolChainFactory
|
|||||||
public:
|
public:
|
||||||
AndroidToolChainFactory();
|
AndroidToolChainFactory();
|
||||||
|
|
||||||
ToolChainList autoDetect(const ToolChainList &alreadyKnown) override;
|
|
||||||
|
|
||||||
class AndroidToolChainInformation
|
class AndroidToolChainInformation
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|||||||
Reference in New Issue
Block a user