forked from qt-creator/qt-creator
QmlDesigner: fix kits not loaded warnings
Change-Id: Iedf4120705c2e4f66d9acca104e1348848b73900
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
(cherry picked from commit ccaa6b6ec7
)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -853,6 +853,8 @@ int ToolBarBackend::currentStyle() const
|
|||||||
|
|
||||||
QStringList ToolBarBackend::kits() const
|
QStringList ToolBarBackend::kits() const
|
||||||
{
|
{
|
||||||
|
if (!ProjectExplorer::KitManager::isLoaded())
|
||||||
|
return {};
|
||||||
auto kits = Utils::filtered(ProjectExplorer::KitManager::kits(), [](ProjectExplorer::Kit *kit) {
|
auto kits = Utils::filtered(ProjectExplorer::KitManager::kits(), [](ProjectExplorer::Kit *kit) {
|
||||||
const auto qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
|
const auto qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
|
||||||
const auto dev = ProjectExplorer::DeviceKitAspect::device(kit);
|
const auto dev = ProjectExplorer::DeviceKitAspect::device(kit);
|
||||||
|
@@ -706,6 +706,8 @@ void StudioWelcomePlugin::extensionsInitialized()
|
|||||||
bool StudioWelcomePlugin::delayedInitialize()
|
bool StudioWelcomePlugin::delayedInitialize()
|
||||||
{
|
{
|
||||||
QTimer::singleShot(2000, this, []() {
|
QTimer::singleShot(2000, this, []() {
|
||||||
|
if (!ProjectExplorer::KitManager::isLoaded())
|
||||||
|
return;
|
||||||
auto modelManager = QmlJS::ModelManagerInterface::instance();
|
auto modelManager = QmlJS::ModelManagerInterface::instance();
|
||||||
if (!modelManager)
|
if (!modelManager)
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user