diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 01:00:12 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-08 22:04:23 +0200 |
| commit | c937ed8af4f3dfef3fd8f8c2a9815376790dd5bf (patch) | |
| tree | 5175aff87e160ae8f32dadc60d3cfd38b73d4fb1 /src/gui/kernel/qplatformdialoghelper.cpp | |
| parent | e0346df1b21cb30b54ae8d4918addc9925fa8479 (diff) | |
| parent | 8823bb8d306d78dd6a2e121a708dc607beff58c8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/gui/kernel/qplatformdialoghelper.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index d2e079b57f..443f5d2552 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -980,7 +980,7 @@ QPlatformDialogHelper::ButtonRole QPlatformDialogHelper::buttonRole(QPlatformDia const int *QPlatformDialogHelper::buttonLayout(Qt::Orientation orientation, ButtonLayout policy) { if (policy == UnknownLayout) { -#if defined (Q_OS_OSX) +#if defined (Q_OS_MACOS) policy = MacLayout; #elif defined (Q_OS_LINUX) || defined (Q_OS_UNIX) policy = KdeLayout; |