diff --git a/src/libs/utils/welcomemodetreewidget.cpp b/src/libs/utils/welcomemodetreewidget.cpp index fb0d6ee83cd5c16a2b00e8e78a5d3348ecd66036..a750aa0b1f1526415c563cb32dbfa3afd7a936b3 100644 --- a/src/libs/utils/welcomemodetreewidget.cpp +++ b/src/libs/utils/welcomemodetreewidget.cpp @@ -35,6 +35,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QMouseEvent> #include <QtGui/QResizeEvent> +#include <QtGui/QImage> enum { leftContentsMargin = 2, topContentsMargin = 2, @@ -240,24 +241,14 @@ WelcomeModeTreeWidgetPrivate::WelcomeModeTreeWidgetPrivate() : itemLayout(new QVBoxLayout) { layout->setMargin(0); - itemLayout->setMargin(0); } WelcomeModeTreeWidget::WelcomeModeTreeWidget(QWidget *parent) : - QScrollArea(parent), m_d(new WelcomeModeTreeWidgetPrivate) + QWidget(parent), m_d(new WelcomeModeTreeWidgetPrivate) { + setLayout(m_d->layout); m_d->layout->addLayout(m_d->itemLayout); m_d->layout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::MinimumExpanding)); - QWidget *contents = new QWidget; - contents->setLayout(m_d->layout); - viewport()->setBackgroundRole(QPalette::Base); // Bright background. - setWidget(contents); - setWidgetResizable(true); - setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setFrameStyle(QFrame::NoFrame); - setFrameShadow(QFrame::Plain); - setContentsMargins(0, 0, 0, 0); } WelcomeModeTreeWidget::~WelcomeModeTreeWidget() diff --git a/src/libs/utils/welcomemodetreewidget.h b/src/libs/utils/welcomemodetreewidget.h index b3f211bcb06fb5854190012018681870ba72ed71..eae57ade97a5029b7aaef0db038825b443f84c12 100644 --- a/src/libs/utils/welcomemodetreewidget.h +++ b/src/libs/utils/welcomemodetreewidget.h @@ -32,7 +32,7 @@ #include "utils_global.h" -#include <QtGui/QScrollArea> +#include <QtGui/QTreeWidget> #include <QtGui/QLabel> namespace Utils { @@ -53,7 +53,7 @@ private: }; // WelcomeModeTreeWidget: Show an itemized list with arrows and emits a signal on click. -class QTCREATOR_UTILS_EXPORT WelcomeModeTreeWidget : public QScrollArea +class QTCREATOR_UTILS_EXPORT WelcomeModeTreeWidget : public QWidget { Q_OBJECT public: diff --git a/src/plugins/projectexplorer/projectwelcomepagewidget.ui b/src/plugins/projectexplorer/projectwelcomepagewidget.ui index 83d58c58f6e11e9dfda1eef288ccd57305a71979..ca0818e9555e1db96de3e7bdc0fa2eaf5362ec7e 100644 --- a/src/plugins/projectexplorer/projectwelcomepagewidget.ui +++ b/src/plugins/projectexplorer/projectwelcomepagewidget.ui @@ -159,7 +159,7 @@ <customwidgets> <customwidget> <class>Utils::WelcomeModeTreeWidget</class> - <extends>QScrollArea</extends> + <extends>QWidget</extends> <header location="global">utils/welcomemodetreewidget.h</header> <container>1</container> </customwidget> diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui index be470d6e5933e55643efcbb030304e3256520358..c62a653e6fed9abc9517076492cee6e8bea2d8f9 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui @@ -340,7 +340,7 @@ <customwidgets> <customwidget> <class>Utils::WelcomeModeTreeWidget</class> - <extends>QScrollArea</extends> + <extends>QWidget</extends> <header location="global">utils/welcomemodetreewidget.h</header> </customwidget> <customwidget> diff --git a/src/plugins/welcome/communitywelcomepagewidget.ui b/src/plugins/welcome/communitywelcomepagewidget.ui index 390d16b7143855628d6128e0359ab3d927ea2bbb..488119ca4ab2b55b14fcc3eb3b5b4e76c6c4f1df 100644 --- a/src/plugins/welcome/communitywelcomepagewidget.ui +++ b/src/plugins/welcome/communitywelcomepagewidget.ui @@ -105,7 +105,7 @@ <customwidgets> <customwidget> <class>Utils::WelcomeModeTreeWidget</class> - <extends>QScrollArea</extends> + <extends>QWidget</extends> <header location="global">utils/welcomemodetreewidget.h</header> </customwidget> <customwidget>