From 96d8c61f0dfb4169d4cd6c7f41612e20dec5278f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Mon, 11 Aug 2014 01:21:32 +0100 Subject: [PATCH] Fix build with QT_NO_DRAGANDDROP viewportSizeHint() should be defined outside the QT_NO_DRAGANDDROP ifndef Change-Id: I7c23c820ea58b3614eb030dc5b0f290ad891ccb1 Reviewed-by: Marc Mutz --- src/widgets/itemviews/qabstractitemview.cpp | 18 +++++++++--------- 1 file 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 @@ -1390,15 +1399,6 @@ bool QAbstractItemView::showDropIndicator() const return d->showDropIndicator; } -/*! - \since 5.2 - \reimp -*/ -QSize QAbstractItemView::viewportSizeHint() const -{ - return QAbstractScrollArea::viewportSizeHint(); -} - /*! \property QAbstractItemView::dragEnabled \brief whether the view supports dragging of its own items