diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-29 10:49:57 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-29 10:49:57 (GMT) |
| commit | cc910f05b560bf561b45e7d726ffd82f3eb28a7b (patch) | |
| tree | 3be96de0b4174cf03a7e4a45d96866d7c2f0d7b7 /src/corelib/io/qfilesystemwatcher.cpp | |
| parent | 9a7ca912ce72476bda57f2306b38e5f6e928fbf5 (diff) | |
| parent | 8fe49324d8b58eb1c0945259da00905cca02822c (diff) | |
| download | Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.zip Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.tar.gz Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index b01302b..d9b994e 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -248,7 +248,7 @@ QFileSystemWatcherEngine *QFileSystemWatcherPrivate::createNativeEngine() eng = QDnotifyFileSystemWatcherEngine::create(); return eng; #elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -# if (defined Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) +# if 0 && (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 |