diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:06:38 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:06:38 +0200 |
| commit | 572200989b224ad68e7b8ae4c0aecceb6ca871a2 (patch) | |
| tree | 5591e8e6c17df64674aa79227ad6b70374c169ff /src/corelib/kernel/qcore_mac_p.h | |
| parent | 7ed024226faa9c53c6bad96fb6c9f38a22d25751 (diff) | |
| parent | 241eca33ed45f112feed18c6256c31e606f47796 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/features/create_cmake.prf
Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
Diffstat (limited to 'src/corelib/kernel/qcore_mac_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index ad6be762c0..fa911fb967 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -65,7 +65,7 @@ #include "qglobal.h" -#ifndef Q_OS_IOS +#ifdef Q_OS_MACX #include <CoreServices/CoreServices.h> #endif |