diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
| commit | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch) | |
| tree | ec1eb5ec4225b596dca92df654d58b72a229d8a6 /src/corelib/kernel | |
| parent | d22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff) | |
| parent | 4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff) | |
| download | Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.zip Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 9591f08..22b6a36 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -68,7 +68,15 @@ # undef qDebug #endif +#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED) #include <ApplicationServices/ApplicationServices.h> +#else +#include <CoreFoundation/CoreFoundation.h> +#endif + +#ifndef QT_NO_CORESERVICES +#include <CoreServices/CoreServices.h> +#endif #undef DEBUG #ifdef OLD_DEBUG |