summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@nokia.com>2011-11-22 10:34:46 +0100
committerJarek Kobus <jaroslaw.kobus@nokia.com>2011-11-22 14:55:33 +0100
commit63007d2ba059f6db45052a30f02c8d913ec20f3c (patch)
tree0113ddd66a990f26c9ef25cf010a3367746dbbeb
parentfad5cc01669bd892b6c30362732c62f5c55c5ba2 (diff)
downloadqt-creator-63007d2ba059f6db45052a30f02c8d913ec20f3c.tar.gz
Give SessionDialog a parent widget
In this way there is no additional item on taskbar Change-Id: Ib946064f3d859a61eaa5495bc4fb7740b641e154 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp2
-rw-r--r--src/plugins/projectexplorer/sessiondialog.cpp4
-rw-r--r--src/plugins/projectexplorer/sessiondialog.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 3b0aaeb71d..830e3a860b 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1165,7 +1165,7 @@ void ProjectExplorerPlugin::showSessionManager()
} else {
d->m_session->save();
}
- SessionDialog sessionDialog(d->m_session);
+ SessionDialog sessionDialog(d->m_session, Core::ICore::instance()->mainWindow());
sessionDialog.setAutoLoadSession(d->m_projectExplorerSettings.autorestoreLastSession);
sessionDialog.exec();
d->m_projectExplorerSettings.autorestoreLastSession = sessionDialog.autoLoadSession();
diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index b943b62b7a..0c593463e4 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -145,8 +145,8 @@ bool SessionNameInputDialog::isSwitchToRequested() const
}
-SessionDialog::SessionDialog(SessionManager *sessionManager)
- : m_sessionManager(sessionManager)
+SessionDialog::SessionDialog(SessionManager *sessionManager, QWidget *parent)
+ : QDialog(parent), m_sessionManager(sessionManager)
{
m_ui.setupUi(this);
diff --git a/src/plugins/projectexplorer/sessiondialog.h b/src/plugins/projectexplorer/sessiondialog.h
index b8e3da69ef..d9700bc05f 100644
--- a/src/plugins/projectexplorer/sessiondialog.h
+++ b/src/plugins/projectexplorer/sessiondialog.h
@@ -48,7 +48,7 @@ class SessionDialog : public QDialog
{
Q_OBJECT
public:
- SessionDialog(SessionManager *sessionManager);
+ SessionDialog(SessionManager *sessionManager, QWidget *parent = 0);
void setAutoLoadSession(bool);
bool autoLoadSession() const;