diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-05 16:47:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-05 16:47:13 +0200 |
| commit | b53e08e3356528e7d240188c8985e205a6eaa2a2 (patch) | |
| tree | 96936333023c58e0eb585efcc55be0ba787aa047 /src/widgets/widgets/qabstractscrollarea.cpp | |
| parent | c48484ea6d39909b7919577701ffeb9656bbea62 (diff) | |
| parent | 0936bc54f907066644503c7d4c390968711c73a7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
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 e830ac3c76..1b48441993 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 |