diff options
author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-05-14 08:36:27 (GMT) |
---|---|---|
committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-05-14 09:55:57 (GMT) |
commit | 23f1fa2e47f3bd4cea92510d70c2e9d0fbbcfc92 (patch) | |
tree | d5d9823bb34585a0205f15d85dafa79ad42b8109 /src/gui | |
parent | 08d4f04947aca96f40e002ed099dfc7be6531e17 (diff) | |
download | Qt-23f1fa2e47f3bd4cea92510d70c2e9d0fbbcfc92.zip Qt-23f1fa2e47f3bd4cea92510d70c2e9d0fbbcfc92.tar.gz Qt-23f1fa2e47f3bd4cea92510d70c2e9d0fbbcfc92.tar.bz2 |
[Regression] Build failure on Mac Carbon
Including objc/runtime.h when using Carbon produced problems so I
protected that include via ifdef.
Task-number: QTBUG-10519
Reviewed-by: Jason Mcdonald
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qt_mac_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h index 3341ce1..ca9541a 100644 --- a/src/gui/kernel/qt_mac_p.h +++ b/src/gui/kernel/qt_mac_p.h @@ -57,7 +57,9 @@ #ifdef __OBJC__ #include <Cocoa/Cocoa.h> +#ifdef QT_MAC_USE_COCOA #include <objc/runtime.h> +#endif // QT_MAC_USE_COCOA #endif #include <CoreServices/CoreServices.h> |