WelcomePage: Fix scrolling logic

We only need one scrollable element in the WelcomePage. By passing
the height properties of inner elements to the outermost one we can
avoid multiple vertical scrollbars next to each other. Since this
removes the QScrollArea around the welcome page it fixes
QTCREATORBUG-10796

Task-number: QTCREATORBUG-10796

Change-Id: I08b0409e21f16be6c3e0e5a58f2665320d0a14fe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 5502f24d20..013b0661f8 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -165,15 +165,9 @@ WelcomeMode::WelcomeMode() :
     styledBar->setObjectName(QLatin1String("WelcomePageStyledBar"));
     layout->addWidget(styledBar);
 
-    QScrollArea *scrollArea = new QScrollArea(m_modeWidget);
-    scrollArea->setFrameShape(QFrame::NoFrame);
-    scrollArea->setWidgetResizable(true);
-
-    QWidget *container = QWidget::createWindowContainer(m_welcomePage, scrollArea);
-    container->setMinimumSize(QSize(880, 548));
-    scrollArea->setWidget(container);
+    QWidget *container = QWidget::createWindowContainer(m_welcomePage, m_modeWidget);
     m_modeWidget->setLayout(layout);
-    layout->addWidget(scrollArea);
+    layout->addWidget(container);
 
     connect(PluginManager::instance(), SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));