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

Prevent modal dialogs from locking up in Qt 5.

Browse Source 
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: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Friedemann Kleint
2012-09-12 11:40:50 +02:00
committed by Friedemann Kleint
parent 2de2af5ee0
commit c5e0f9cfbd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
View File

@@ -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)

3
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
View File

@@ -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)