diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-01 13:11:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-03 08:28:42 +0100 |
| commit | 1a764d00ee56fe02a708bc057acddf03408ba303 (patch) | |
| tree | 602a37a28892812ec6a6048fb1ddc89cb2361aaf /src/quick/items/qquickitem.cpp | |
| parent | a6fbea98ed3c2cce4bd1b2d4ec2dc055b4eaf129 (diff) | |
Fix application build when combining with Mac OS X Cocoa headers
OSX's AssertMacros.h unconditionally defines macros like "check" and that
clashes with qml's type discovery templates that define a check function
and that are used by qmlRegisterType and friends.
There's a comment in the OS X headers suggesting that this will be fixed
in the "next" release, but that hasn't happened for a while and the bug
is still present in 10.10. So let's work around it and make life easier
for people using Qml and Cocoa at the same time.
Change-Id: I005d21188f92deaebd45bce2e6484cd4deeb9a34
Task-number: QTBUG-36309
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
0 files changed, 0 insertions, 0 deletions