From c5e0f9cfbdf2fee02d66c7dfff0a4d4977c2afe0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 12 Sep 2012 11:40:50 +0200
Subject: [PATCH] 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: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp | 3 ++-
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
index a393cf8df09..903f3655409 100644
--- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
@@ -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)
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index 350030eccb5..d8d5abb3b90 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -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)
--
GitLab