Commit 598a4c46 authored by Daniel Teske's avatar Daniel Teske

ProjectMode: Fix double scrollbar

The Build and Run pages already have a scrollbar, so remove the
outer scrollbar.

Change-Id: I1b3ac31d2fa85c7ddca2b22644107c0718a13f7c
Task-number: QTCREATORBUG-14289
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent d1a7176f
......@@ -139,7 +139,10 @@ QString TargetSettingsWidget::targetNameAt(int index) const
void TargetSettingsWidget::setCentralWidget(QWidget *widget)
{
ui->scrollArea->setWidget(widget);
if (m_centralWidget)
ui->scrollAreaWidgetContents->layout()->removeWidget(m_centralWidget);
m_centralWidget = widget;
ui->scrollAreaWidgetContents->layout()->addWidget(m_centralWidget);
}
int TargetSettingsWidget::targetCount() const
......
......@@ -83,6 +83,7 @@ private:
TargetSelector *m_targetSelector;
QPushButton *m_addButton;
QPushButton *m_manageButton;
QWidget *m_centralWidget = 0;
};
} // namespace Internal
......
......@@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
......@@ -30,7 +39,7 @@
</property>
</widget>
</item>
<item>
<item>
<widget class="QWidget" name="separator" native="true">
<property name="minimumSize">
<size>
......@@ -130,23 +139,24 @@
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>618</width>
<height>424</height>
</rect>
<widget class="QWidget" name="scrollAreaWidgetContents" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</widget>
</layout>
</widget>
</item>
</layout>
......
Markdown is supported
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