Commit 87ea12a6 authored by Thomas Hartmann's avatar Thomas Hartmann

WelcomePage: Fix minimum size

The Welcome page should not impose a minimum size on Qt Creator.
We use a ScrollArea instead. This was a regression introduced by porting
to Qt Quick 2.

Task-number: QTCREATORBUG-10505
Change-Id: I5bbe4a18bdb96e91723987995a3632487bab536d
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 3948eeaf
......@@ -165,16 +165,15 @@ WelcomeMode::WelcomeMode() :
styledBar->setObjectName(QLatin1String("WelcomePageStyledBar"));
layout->addWidget(styledBar);
// QScrollArea *scrollArea = new QScrollArea(m_modeWidget);
// scrollArea->setFrameShape(QFrame::NoFrame);
// layout->addWidget(scrollArea);
// scrollArea->setWidget(m_welcomePage);
// scrollArea->setWidgetResizable(true);
QScrollArea *scrollArea = new QScrollArea(m_modeWidget);
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setWidgetResizable(true);
QWidget *container = QWidget::createWindowContainer(m_welcomePage, m_modeWidget);
QWidget *container = QWidget::createWindowContainer(m_welcomePage, scrollArea);
container->setMinimumSize(QSize(880, 548));
layout->addWidget(container);
scrollArea->setWidget(container);
m_modeWidget->setLayout(layout);
layout->addWidget(scrollArea);
connect(PluginManager::instance(), SIGNAL(objectAdded(QObject*)), SLOT(welcomePluginAdded(QObject*)));
......
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