From 48270d58a6170f81a6c8d79a42f5a2b6cb0942e5 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 10 Dec 2015 16:17:00 +0100
Subject: [PATCH] SummaryPage: Be more robust wrt. selecting from the combobox
QComboBox::view() is the popup only, so do not use that to query for
the selected value of the combobox.
Task-number: QTCREATORBUG-15454
Change-Id: I1279a1c35e7e6f092d623199203ea50620690304
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
---
src/plugins/projectexplorer/projectwizardpage.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index 965897b1e3c..2f412d88335 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -128,6 +128,8 @@ QVariant AddNewTree::data(int, int role) const
return m_displayName;
if (role == Qt::ToolTipRole)
return m_toolTip;
+ if (role == Qt::UserRole)
+ return QVariant::fromValue(static_cast<void*>(node()));
return QVariant();
}
@@ -403,9 +405,8 @@ void ProjectWizardPage::setBestNode(AddNewTree *tree)
FolderNode *ProjectWizardPage::currentNode() const
{
- QModelIndex index = m_ui->projectComboBox->view()->currentIndex();
- TreeItem *item = m_model->itemForIndex(index);
- return item ? static_cast<AddNewTree *>(item)->node() : 0;
+ QVariant v = m_ui->projectComboBox->currentData(Qt::UserRole);
+ return v.isNull() ? 0 : static_cast<FolderNode *>(v.value<void *>());
}
void ProjectWizardPage::setAddingSubProject(bool addingSubProject)
--
GitLab