diff options
| author | sh kim <sukhyun.kim@nokia.com> | 2012-03-14 15:38:10 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 11:37:18 +0100 |
| commit | ba061da5f07b55bfd8a449b794d439c59d2f13d2 (patch) | |
| tree | d66f356b2a42b17353ddef23f1cc7349022a8f6f /src/corelib/io | |
| parent | 255079124a5378c71ec25726eee9ba3d648c56c6 (diff) | |
Fix build error when QT_NO_FILESYSTEMWATCHER is set
QPollingFileSystemWatcherEngine inherits from QFileSystemWatcherEngine.
This class should be covered by !QT_NO_FILESYSTEMWATCHER.
Change-Id: I053a873018cf3c9c443435c9b3f44240b0965c24
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_polling.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemwatcher_polling_p.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp index 92d0a2b6b0..c29fe8c264 100644 --- a/src/corelib/io/qfilesystemwatcher_polling.cpp +++ b/src/corelib/io/qfilesystemwatcher_polling.cpp @@ -42,6 +42,8 @@ #include "qfilesystemwatcher_polling_p.h" #include <QtCore/qtimer.h> +#ifndef QT_NO_FILESYSTEMWATCHER + QT_BEGIN_NAMESPACE QPollingFileSystemWatcherEngine::QPollingFileSystemWatcherEngine(QObject *parent) @@ -149,3 +151,4 @@ void QPollingFileSystemWatcherEngine::timeout() } QT_END_NAMESPACE +#endif // !QT_NO_FILESYSTEMWATCHER diff --git a/src/corelib/io/qfilesystemwatcher_polling_p.h b/src/corelib/io/qfilesystemwatcher_polling_p.h index e50082c6d3..926c3baa07 100644 --- a/src/corelib/io/qfilesystemwatcher_polling_p.h +++ b/src/corelib/io/qfilesystemwatcher_polling_p.h @@ -62,6 +62,7 @@ #include "qfilesystemwatcher_p.h" +#ifndef QT_NO_FILESYSTEMWATCHER QT_BEGIN_NAMESPACE enum { PollingInterval = 1000 }; @@ -122,6 +123,6 @@ private: }; QT_END_NAMESPACE - +#endif // !QT_NO_FILESYSTEMWATCHER #endif // QFILESYSTEMWATCHER_POLLING_P_H |