forked from qt-creator/qt-creator
QmlPreview: fix crash
Is fixed in qds/dev through QtCreator 16 API usage Change-Id: I8646c455e11c9667ff7058b37c3eceb3e209d293 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -148,10 +148,14 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent)
|
||||
if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current())
|
||||
m_localeIsoCode = multiLanguageAspect->currentLocale();
|
||||
bool skipDeploy = false;
|
||||
const Kit *kit = ProjectManager::startupTarget()->kit();
|
||||
if (ProjectManager::startupTarget() && kit)
|
||||
skipDeploy = kit->supportedPlatforms().contains(Android::Constants::ANDROID_DEVICE_TYPE)
|
||||
|| DeviceTypeKitAspect::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE;
|
||||
if (ProjectManager::startupTarget()) {
|
||||
if (const Kit *kit = ProjectManager::startupTarget()->kit()) {
|
||||
skipDeploy = kit->supportedPlatforms().contains(
|
||||
Android::Constants::ANDROID_DEVICE_TYPE)
|
||||
|| DeviceTypeKitAspect::deviceTypeId(kit)
|
||||
== Android::Constants::ANDROID_DEVICE_TYPE;
|
||||
}
|
||||
}
|
||||
ProjectExplorerPlugin::runStartupProject(Constants::QML_PREVIEW_RUN_MODE, skipDeploy);
|
||||
});
|
||||
menu->addAction(
|
||||
|
Reference in New Issue
Block a user