diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index c74ab6e6fd8..33f2438a428 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -331,6 +331,7 @@ void DetailsWidget::setState(State state)
return;
d->m_state = state;
d->updateControls();
+ emit expanded(d->m_state == Expanded);
}
void DetailsWidget::setExpanded(bool expanded)
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index 6d5f741de21..7f69c88301c 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -90,6 +90,7 @@ public:
signals:
void checked(bool);
void linkActivated(const QString &link);
+ void expanded(bool);
private slots:
void setExpanded(bool);
diff --git a/src/plugins/qtsupport/debugginghelper.ui b/src/plugins/qtsupport/debugginghelper.ui
index 88fc3045ce3..26d647cdacb 100644
--- a/src/plugins/qtsupport/debugginghelper.ui
+++ b/src/plugins/qtsupport/debugginghelper.ui
@@ -6,8 +6,8 @@
0
0
- 321
- 159
+ 404
+ 176
@@ -28,24 +28,17 @@
-
+
+
+ 2
+ 0
+
+
TextLabel
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
@@ -58,38 +51,17 @@
-
+
+
+ 2
+ 0
+
+
TextLabel
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Build
-
-
-
- -
-
-
- Build
-
-
-
-
@@ -99,31 +71,17 @@
-
+
+
+ 2
+ 0
+
+
TextLabel
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Build
-
-
-
-
@@ -136,25 +94,39 @@
-
+
+
+ 2
+ 0
+
+
TextLabel
- -
-
-
- Qt::Horizontal
+
-
+
+
+ Build
-
-
- 40
- 20
-
-
-
+
- -
+
-
+
+
+ Build
+
+
+
+ -
+
+
+ Build
+
+
+
+ -
Build
@@ -163,22 +135,6 @@
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 10
-
-
-
-
-
-
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 3781467dc68..487ab794b61 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -151,6 +151,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList
m_ui->versionInfoWidget->setState(Utils::DetailsWidget::NoSummary);
m_ui->debuggingHelperWidget->setWidget(debuggingHelperDetailsWidget);
+ connect(m_ui->debuggingHelperWidget, SIGNAL(expanded(bool)),
+ this, SLOT(handleDebuggingHelperExpanded(bool)));
// setup parent items for auto-detected and manual versions
m_ui->qtdirList->header()->setResizeMode(QHeaderView::ResizeToContents);
@@ -369,6 +371,11 @@ void QtOptionsPageWidget::qtVersionsDumpUpdated(const QString &qmakeCommand)
}
}
+void QtOptionsPageWidget::handleDebuggingHelperExpanded(bool expanded)
+{
+ m_ui->versionInfoWidget->setVisible(!expanded);
+}
+
QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const BaseQtVersion *version)
{
ValidityInfo info;
diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h
index 743cd5a4ba5..174387ebbc5 100644
--- a/src/plugins/qtsupport/qtoptionspage.h
+++ b/src/plugins/qtsupport/qtoptionspage.h
@@ -118,6 +118,7 @@ private slots:
void selectedToolChainChanged(int index);
void qtVersionsDumpUpdated(const QString &qmakeCommand);
+ void handleDebuggingHelperExpanded(bool expanded);
private:
struct ValidityInfo {