diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-31 16:36:25 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-31 17:29:06 +0200 |
| commit | a5cf862f612bfd3db91ab1a6974d7c02aa823857 (patch) | |
| tree | 7a0103c0743328edf01ea92e8089a9350e9897ef /src/widgets/widgets/qabstractscrollarea.cpp | |
| parent | c0429719c1a28bb1a0d88862b3a8c84525ee9a48 (diff) | |
| parent | 87d15f2c1b5f890d5477c2979227a872e3ce207b (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into refs/staging/5.3
Diffstat (limited to 'src/widgets/widgets/qabstractscrollarea.cpp')
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index e1e933cdd8..98e715fc62 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -309,7 +309,7 @@ void QAbstractScrollAreaPrivate::init() q->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); layoutChildren(); -#ifndef Q_WS_MAC +#ifndef Q_OS_OSX # ifndef QT_NO_GESTURES viewport->grabGesture(Qt::PanGesture); # endif |