summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-09-29 07:11:37 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2009-09-29 07:14:56 (GMT)
commit888b6a6d32d2c9e6a5cd3ebe4d496c6e1c6ce64d (patch)
tree22a81b52c1b7027dec086acb2e1ed2d8434545e8 /src/corelib
parent8aec69a5cae285174b41df6d268f007edcdec84b (diff)
downloadQt-888b6a6d32d2c9e6a5cd3ebe4d496c6e1c6ce64d.zip
Qt-888b6a6d32d2c9e6a5cd3ebe4d496c6e1c6ce64d.tar.gz
Qt-888b6a6d32d2c9e6a5cd3ebe4d496c6e1c6ce64d.tar.bz2
Revert the new QFSEventsFileSystemWatcherEngine on Mac for now.
This new QFSEventsFileSystemWatcherEngine was introduced in 4.6 in order to speed up Qt, but we have experienced dead lock and auto-tests regressions (QFilesystemModel). Task-number:QT-2217 Reviewed-by:brad Reviewed-by:denis Reviewed-by:richard
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qfilesystemwatcher.cpp2
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