AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reserve the virtual viewportSizeHint method in QAbstractScrollArea.

Browse Source 
The virtual method will be used to implement
the patch at http://codereview.qt-project.org/#change,11763

Change-Id: I6d6ffbb8aaaba73e5c769f3435cc60323c77b75a
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2012-03-19 12:21:11 +01:00 committed by Qt by Nokia
parent afa50b1478
commit 0042b5f0f2
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1489,6 +1489,16 @@ void QAbstractScrollArea::setupViewport(QWidget *viewport)
Q_UNUSED(viewport); Q_UNUSED(viewport);
} }
/*!
\internal
This method is reserved for future use.
*/
QSize QAbstractScrollArea::viewportSizeHint() const
{
return QSize();
}
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qabstractscrollarea.cpp" #include "moc_qabstractscrollarea.cpp"

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

@ -122,6 +122,8 @@ protected:
virtual void scrollContentsBy(int dx, int dy); virtual void scrollContentsBy(int dx, int dy);
virtual QSize viewportSizeHint() const;
private: private:
Q_DECLARE_PRIVATE(QAbstractScrollArea) Q_DECLARE_PRIVATE(QAbstractScrollArea)
Q_DISABLE_COPY(QAbstractScrollArea) Q_DISABLE_COPY(QAbstractScrollArea)