summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2016-06-17 10:02:59 +0200
committerOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>2016-06-17 14:58:30 +0000
commitf7a0968da436f20f68ebff9bb9773afccf2bd5be (patch)
tree181aa202553fa44fde028de42b99b14d00d2ab2f
parentb82707a7b671ec4112aee76baf9f87c289e2b601 (diff)
Forward declarations for platform specific types should also be done with Q_QDOC
The clang based qdoc need to be able to parse properly anything that is in #ifdef Q_QDOC The #if for the forward declararion now match the one in which it is used. Change-Id: Ia6cf84dd07a979b4e7aa8da764d9fb2fce74baa1 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
-rw-r--r--src/corelib/tools/qpoint.h2
-rw-r--r--src/corelib/tools/qrect.h2
-rw-r--r--src/corelib/tools/qsize.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index e2d7f4372a..7b1004897a 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -42,7 +42,7 @@
#include <QtCore/qnamespace.h>
-#if defined(Q_OS_DARWIN)
+#if defined(Q_OS_DARWIN) || defined(Q_QDOC)
struct CGPoint;
#endif
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h
index 8ce668f8ec..f973cf3494 100644
--- a/src/corelib/tools/qrect.h
+++ b/src/corelib/tools/qrect.h
@@ -48,7 +48,7 @@
#error qrect.h must be included before any header file that defines topLeft
#endif
-#if defined(Q_OS_DARWIN)
+#if defined(Q_OS_DARWIN) || defined(Q_QDOC)
struct CGRect;
#endif
diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h
index 74698224f2..cd5f8adbf5 100644
--- a/src/corelib/tools/qsize.h
+++ b/src/corelib/tools/qsize.h
@@ -42,7 +42,7 @@
#include <QtCore/qnamespace.h>
-#if defined(Q_OS_DARWIN)
+#if defined(Q_OS_DARWIN) || defined(Q_QDOC)
struct CGSize;
#endif