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

ProjectExplorer: Disable copying steps to inactive kits

Browse Source 
This fixes a hard crash due to a Target nullptr.

Change-Id: I3065ac61bc950413d8958bcad5420f5868afd35c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-01-19 10:22:38 +01:00
parent bdd0c83751
commit ec5a669b39
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/project.cpp
View File

@@ -276,6 +276,7 @@ Target *Project::createTarget(Kit *k)
bool Project::copySteps(Target *sourceTarget, Target *newTarget) bool Project::copySteps(Target *sourceTarget, Target *newTarget)
{ {
QTC_ASSERT(newTarget, return false);
bool fatalError = false; bool fatalError = false;
QStringList buildconfigurationError; QStringList buildconfigurationError;
QStringList deployconfigurationError; QStringList deployconfigurationError;

2
src/plugins/projectexplorer/targetsettingspanel.cpp
View File

@@ -447,7 +447,7 @@ public:
}); });
QMenu *copyMenu = menu->addMenu(tr("Copy Steps From Other Kit...")); QMenu *copyMenu = menu->addMenu(tr("Copy Steps From Other Kit..."));
if (m_kitId.isValid()) { if (m_kitId.isValid() && m_project->target(m_kitId)) {
const QList<Kit *> kits = KitManager::kits(); const QList<Kit *> kits = KitManager::kits();
for (Kit *kit : kits) { for (Kit *kit : kits) {
QAction *copyAction = copyMenu->addAction(kit->displayName()); QAction *copyAction = copyMenu->addAction(kit->displayName());