diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
| commit | 8dd22d9255287bad17823d8738ac05dbffca33ab (patch) | |
| tree | 94cc700070d567960260171e7edfad9d587d1b6e /src/gui/kernel/qkeysequence.cpp | |
| parent | 7a342372bb1ecbe4146811cff48ede974c7761b5 (diff) | |
| parent | 9b800b55c1c4f2b3e6ed365736e357eb31423c95 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia443f6eb1c854c99c68127a376b78c1986675a9d
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 71ecc46cb60..9a9677b476d 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -42,7 +42,7 @@ #include <qpa/qplatformtheme.h> #include "private/qguiapplication_p.h" -#ifndef QT_NO_SHORTCUT +#if !defined(QT_NO_SHORTCUT) || defined(Q_CLANG_QDOC) #include "qdebug.h" #include <QtCore/qhashfunctions.h> @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) static bool qt_sequence_no_mnemonics = true; struct MacSpecialKey { int key; |