diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-21 17:57:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 17:57:54 +0100 |
commit | 46791c08e17740418cc701b8862a980c0f711b87 (patch) | |
tree | bedba63fc48b80c2a2df54ea91c3f35398953aac /src/widgets/widgets/qtoolbar_p.h | |
parent | b8a38a6737acd670d92197ca5b009590d9fd8a9c (diff) | |
parent | 9033977d3971db5352a2bb51052a723a2ac57a8f (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qtoolbar_p.h')
-rw-r--r-- | src/widgets/widgets/qtoolbar_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h index 9ff0b9d61c..c9dd0490cd 100644 --- a/src/widgets/widgets/qtoolbar_p.h +++ b/src/widgets/widgets/qtoolbar_p.h @@ -75,7 +75,7 @@ public: allowedAreas(Qt::AllToolBarAreas), orientation(Qt::Horizontal), toolButtonStyle(Qt::ToolButtonIconOnly), layout(0), state(0) -#ifdef Q_WS_MAC +#ifdef Q_OS_OSX , macWindowDragging(false) #endif { } @@ -107,7 +107,7 @@ public: }; DragState *state; -#ifdef Q_WS_MAC +#ifdef Q_OS_OSX bool macWindowDragging; QPoint macWindowDragPressPosition; #endif |