Commit c5e0f9cf authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Friedemann Kleint
Browse files

Prevent modal dialogs from locking up in Qt 5.



When choosing "Manage kits" from the wizard, the settings dialog
locks up when using Qt 5 since 2 modal dialogs execute on the
mainwindow.

Task-number: QTBUG-27206

Change-Id: I69b756fed48983ec7217452b2f6c3049a520f1c3
Reviewed-by: default avatarOliver Wolff <oliver.wolff@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 2de2af5e
......@@ -230,7 +230,8 @@ void Qt4TargetSetupWidget::manageKit()
page->showKit(m_kit);
Core::ICore::showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID));
QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID),
this);
}
void Qt4TargetSetupWidget::setProFilePath(const QString &proFilePath)
......
......@@ -614,7 +614,8 @@ void TargetSetupPage::updateVisibility()
void TargetSetupPage::openOptions()
{
Core::ICore::instance()->showOptionsDialog(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY),
QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID));
QLatin1String(ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID),
this);
}
void TargetSetupPage::removeWidget(ProjectExplorer::Kit *k)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment