diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2014-08-11 01:21:32 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2014-08-11 11:05:50 +0200 |
| commit | 96d8c61f0dfb4169d4cd6c7f41612e20dec5278f (patch) | |
| tree | 0c54cb7c25bda3989cc63e42a72e22ba9feca17c /src/widgets | |
| parent | 909d3f5c733dde02074a737a5f1dbe3e51dbef32 (diff) | |
Fix build with QT_NO_DRAGANDDROP
viewportSizeHint() should be defined outside the QT_NO_DRAGANDDROP ifndef
Change-Id: I7c23c820ea58b3614eb030dc5b0f290ad891ccb1
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index b2dc614b2b..a77448cbc4 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -1370,6 +1370,15 @@ bool QAbstractItemView::tabKeyNavigation() const return d->tabKeyNavigation; } +/*! + \since 5.2 + \reimp +*/ +QSize QAbstractItemView::viewportSizeHint() const +{ + return QAbstractScrollArea::viewportSizeHint(); +} + #ifndef QT_NO_DRAGANDDROP /*! \property QAbstractItemView::showDropIndicator @@ -1391,15 +1400,6 @@ bool QAbstractItemView::showDropIndicator() const } /*! - \since 5.2 - \reimp -*/ -QSize QAbstractItemView::viewportSizeHint() const -{ - return QAbstractScrollArea::viewportSizeHint(); -} - -/*! \property QAbstractItemView::dragEnabled \brief whether the view supports dragging of its own items |