diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-03-19 12:21:11 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 19:09:27 +0100 |
| commit | 0042b5f0f2bef3d2affb3e7b44613d13830ee94a (patch) | |
| tree | 47e949c6fac88f1dae26ce4bed68465a44f82918 | |
| parent | afa50b1478f8ecea30c4991ff753162e750fc7dc (diff) | |
Reserve the virtual viewportSizeHint method in QAbstractScrollArea.
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>
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index a960ce8d9c..dc96321599 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -1489,6 +1489,16 @@ void QAbstractScrollArea::setupViewport(QWidget *viewport) Q_UNUSED(viewport); } +/*! + \internal + + This method is reserved for future use. +*/ +QSize QAbstractScrollArea::viewportSizeHint() const +{ + return QSize(); +} + QT_END_NAMESPACE #include "moc_qabstractscrollarea.cpp" diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index f155f52920..2f1168a4f1 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -122,6 +122,8 @@ protected: virtual void scrollContentsBy(int dx, int dy); + virtual QSize viewportSizeHint() const; + private: Q_DECLARE_PRIVATE(QAbstractScrollArea) Q_DISABLE_COPY(QAbstractScrollArea) |