diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2012-10-16 16:53:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-18 15:19:48 +0200 |
| commit | 92e4ec7a146660362f365d8a54e0f017c8f48bd9 (patch) | |
| tree | 77414ee60a8064a17cfbe92b76b4be8ffc8897c3 /src | |
| parent | e75be9f30e88f0bef361144887fb36a30079cb7d (diff) | |
Bring back Mac dependent code in QBoxLayout, QGridLayout
We also made an accessibility auto-test more stable, so that it would
not be influenced by this patch.
Task-number: QTCREATORBUG-7966
Change-Id: I6ce4e2361c8847aee5dd1cf5664c29cd2d83e38d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qboxlayout.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/kernel/qgridlayout.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index d05efaa5b0..d16c999508 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -162,7 +162,7 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b int t = topMargin; int r = rightMargin; int b = bottomMargin; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC Q_Q(const QBoxLayout); if (horz(dir)) { QBoxLayoutItem *leftBox = 0; @@ -311,7 +311,7 @@ void QBoxLayoutPrivate::setupGeom() if (!empty) { if (fixedSpacing >= 0) { spacing = (previousNonEmptyIndex >= 0) ? fixedSpacing : 0; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC if (!horz(dir) && previousNonEmptyIndex >= 0) { QBoxLayoutItem *sibling = (dir == QBoxLayout::TopToBottom ? box : list.at(previousNonEmptyIndex)); if (sibling) { diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 5dd840e80a..b5cd746c03 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -231,7 +231,7 @@ void QGridLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int * int t = topMargin; int r = rightMargin; int b = bottomMargin; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC int leftMost = INT_MAX; int topMost = INT_MAX; int rightMost = 0; |