doc: Don't let qdoc see some defines that cause trouble

This update surrounds some #defines with #ifndef Q_CLANG_QDOC
because they define some names that conflict with formal parameter
names. Otherwise, clang starts replacing formal parameter names
with $27 etc, when qdoc runs, and that causes trouble for qdoc.
The change also replaces one use of Q_QDOC with Q_CLANG_QDOC.

Change-Id: I6e93bf1e0d30d7590280b6f18f0e694556050685
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
bb10
Martin Smith 2017-03-22 12:55:41 +01:00
parent e210b1233d
commit 87cce3e061
2 changed files with 3 additions and 1 deletions

View File

@ -59,7 +59,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks);
#endif
#ifdef Q_QDOC
#ifdef Q_CLANG_QDOC
void qt_set_sequence_auto_mnemonic(bool b);
#endif

View File

@ -55,6 +55,7 @@
#pragma qt_sync_stop_processing
#endif
#ifndef Q_CLANG_QDOC
#define zero $0
#define AT $1
#define v0 $2
@ -88,6 +89,7 @@
#define fp $30
#define s8 $30
#define ra $31
#endif
/*
* LEAF_MIPS32R2 - declare leaf_mips32r2 routine