Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I9620928b431cefa995a06db85ecfcb92f225f732

1 files changed, 8 insertions, 1 deletions

diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index d22d398334..123cbf0437 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -52,6 +52,7 @@
 #include <QMouseEvent>
 #include <QOpenGLWidget>
 #include <QPainter>
+#include <QScrollArea>
 #include <QStackedWidget>
 #include <QTimer>
 #include <QVBoxLayout>
@@ -292,6 +293,11 @@ WelcomeMode::WelcomeMode()
     m_modeWidget->setPalette(palette);
 
     m_sideBar = new SideBar(m_modeWidget);
+    auto scrollableSideBar = new QScrollArea(m_modeWidget);
+    scrollableSideBar->setWidget(m_sideBar);
+    scrollableSideBar->setWidgetResizable(true);
+    scrollableSideBar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollableSideBar->setFrameShape(QFrame::NoFrame);
 
     auto divider = new QWidget(m_modeWidget);
     divider->setMaximumWidth(1);
@@ -300,10 +306,11 @@ WelcomeMode::WelcomeMode()
     divider->setPalette(themeColor(Theme::Welcome_DividerColor));
 
     m_pageStack = new QStackedWidget(m_modeWidget);
+    m_pageStack->setObjectName("WelcomeScreenStackedWidget");
     m_pageStack->setAutoFillBackground(true);
 
     auto hbox = new QHBoxLayout;
-    hbox->addWidget(m_sideBar);
+    hbox->addWidget(scrollableSideBar);
     hbox->addWidget(divider);
     hbox->addWidget(m_pageStack);
     hbox->setStretchFactor(m_pageStack, 10);