From f1eb4c4463d4e71ccb944711a2e9fa122b802abb Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 29 Jan 2018 14:47:12 +0100 Subject: doc: Add tests of Q_CLANG_QDOC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some defined(Q_CLANG_QDOC) uses were added. Change-Id: I5688fee0d0d8f00bb97e3e63bd02a68ddbfdda11 Reviewed-by: Topi Reiniö --- src/gui/kernel/qkeysequence.cpp | 4 ++-- src/gui/kernel/qkeysequence.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 71ecc46cb6..9a9677b476 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -42,7 +42,7 @@ #include #include "private/qguiapplication_p.h" -#ifndef QT_NO_SHORTCUT +#if !defined(QT_NO_SHORTCUT) || defined(Q_CLANG_QDOC) #include "qdebug.h" #include @@ -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; diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 82b88e5d99..65f3a93d9c 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -47,19 +47,19 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_SHORTCUT +#if !defined(QT_NO_SHORTCUT) || defined(Q_CLANG_QDOC) class QKeySequence; /***************************************************************************** QKeySequence stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#if !defined(QT_NO_DATASTREAM) || defined(Q_CLANG_QDOC) Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); #endif -#ifdef Q_CLANG_QDOC +#if defined(Q_CLANG_QDOC) void qt_set_sequence_auto_mnemonic(bool b); #endif @@ -225,7 +225,7 @@ public: Q_DECLARE_SHARED(QKeySequence) -#ifndef QT_NO_DEBUG_STREAM +#if !defined(QT_NO_DEBUG_STREAM) || defined(Q_CLANG_QDOC) Q_GUI_EXPORT QDebug operator<<(QDebug, const QKeySequence &); #endif -- cgit v1.2.3