diff options
| author | Raphael Kubo da Costa <kubito@gmail.com> | 2009-09-13 07:46:52 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-13 07:46:52 (GMT) |
| commit | 17b946bd348c12decbf16c553805b0d6e97d1378 (patch) | |
| tree | 6ebcd995f763058f226850457219e69dac0fba59 /src/corelib/io | |
| parent | f129de853154dc1d72cb5651606ca009c3b1f814 (diff) | |
| download | Qt-17b946bd348c12decbf16c553805b0d6e97d1378.zip Qt-17b946bd348c12decbf16c553805b0d6e97d1378.tar.gz Qt-17b946bd348c12decbf16c553805b0d6e97d1378.tar.bz2 | |
Do not make Mac-specific checks on FreeBSD.
Commit 098be4ff adds a check for MAC_OS_X_VERSION_MAX_ALLOWED and
MAC_OS_X_VERSION_10_5, which do not exist on FreeBSD. Therefore, both
evaluate to 0 and a Mac-specific header ends up included.
This commit properly verifies that Q_OS_MAC is defined before performing
that check.
Merge-request: 1477
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index ae6ef58..b01302b 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -58,7 +58,7 @@ # include "qfilesystemwatcher_inotify_p.h" # include "qfilesystemwatcher_dnotify_p.h" #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -# if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) +# if (defined Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) # include "qfilesystemwatcher_fsevents_p.h" # endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) # include "qfilesystemwatcher_kqueue_p.h" @@ -248,7 +248,7 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine() eng = QDnotifyFileSystemWatcherEngine::create(); return eng; #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -# if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) +# if (defined Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) return QFSEventsFileSystemWatcherEngine::create(); else |