From 87cce3e06156fd881f4491ff389b7f6cb6a22975 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 22 Mar 2017 12:55:41 +0100 Subject: doc: Don't let qdoc see some defines that cause trouble MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- src/gui/painting/qt_mips_asm_dsp_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/painting') diff --git a/src/gui/painting/qt_mips_asm_dsp_p.h b/src/gui/painting/qt_mips_asm_dsp_p.h index 1393a35667..172910ea1c 100644 --- a/src/gui/painting/qt_mips_asm_dsp_p.h +++ b/src/gui/painting/qt_mips_asm_dsp_p.h @@ -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 -- cgit v1.2.3