whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace a pseudo-virtual slot with a virtual method. 

Change-Id: I5d0e1e54e0d3d441b71b7594bc14e872512cc937
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Stephen Kelly 2011-12-19 19:08:07 +01:00 committed by Qt by Nokia
parent d17b56f42b
commit 636aebb823
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qabstractscrollarea.cpp
View File

@ -572,7 +572,7 @@ void QAbstractScrollArea::setViewport(QWidget *widget)
d->layoutChildren();
if (isVisible())
d->viewport->show();
QMetaObject::invokeMethod(this, "setupViewport", Q_ARG(QWidget *, widget));
setupViewport(widget);
delete oldViewport;
}
}

3
src/widgets/widgets/qabstractscrollarea.h
View File

@ -90,8 +90,7 @@ public:
QSize sizeHint() const;
protected Q_SLOTS:
void setupViewport(QWidget *viewport);
virtual void setupViewport(QWidget *viewport);
protected:
QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0);