From a374e164efe3f315d5dc6d767a2a16ee2a5eb4d9 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Wed, 31 Jan 2018 13:18:25 +0100
Subject: [PATCH] qdoc: Remove __cplusplus from the defines list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

__cplusplus was removed from the list of defines passed to
qdoc because it should not be there for clang-qdoc.

Change-Id: I32802e68d915f7a5b717f16ba26a1cd57d7ff645
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 doc/global/qt-cpp-defines.qdocconf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 4dbe144913..13533555c5 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -13,7 +13,6 @@ defines                 += Q_QDOC \
                           QT_DEPRECATED \
                           QT_DEPRECATED_* \
                           Q_NO_USING_KEYWORD \
-                          __cplusplus \
                           Q_OS_.* \
                           Q_STDLIB_UNICODE_STRINGS \
                           Q_COMPILER_INITIALIZER_LISTS \
@@ -21,8 +20,7 @@ defines                 += Q_QDOC \
                           Q_COMPILER_UNIFORM_INIT \
                           Q_COMPILER_RVALUE_REFS
 
-clangdefines            += __cplusplus \
-                           Q_QDOC \
+clangdefines            += Q_QDOC \
                            Q_CLANG_QDOC \
                            QT_COMPAT \
                            QT3_SUPPORT \