summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-06-15 13:57:23 -0700
committerThiago Macieira <thiago.macieira@intel.com>2016-07-20 06:49:53 +0000
commitea582cdcbf8c5b94f9baf5bffdbedc622d39ed9f (patch)
tree154905b62d1dfd81eb14698f669bc6730df41705
parentdabaaf96b77066f7d3bb113210ac21097c7ad1e2 (diff)
Work around Apple defining "check"
The header says they'll stop doing that in the next release. It's been like that since at least the OS X 10.8 SDK... Change-Id: Ib57b52598e2f452985e9fffd14585d4838dc8b09 Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r--src/corelib/kernel/qeventdispatcher_unix_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h
index df080809b6..32c9de03fa 100644
--- a/src/corelib/kernel/qeventdispatcher_unix_p.h
+++ b/src/corelib/kernel/qeventdispatcher_unix_p.h
@@ -84,6 +84,11 @@ public:
};
+#ifdef check
+// defined in Apple's /usr/include/AssertMacros.h header
+# undef check
+#endif
+
class QEventDispatcherUNIXPrivate;
#ifdef Q_OS_QNX