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>

diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp
index 92d0a2b..c29fe8c 100644 (file)
--- 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>
 
 #include "qfilesystemwatcher_polling_p.h"
 #include <QtCore/qtimer.h>
 

+#ifndef QT_NO_FILESYSTEMWATCHER
+

 QT_BEGIN_NAMESPACE
 
 QPollingFileSystemWatcherEngine::QPollingFileSystemWatcherEngine(QObject *parent)
 QT_BEGIN_NAMESPACE
 
 QPollingFileSystemWatcherEngine::QPollingFileSystemWatcherEngine(QObject *parent)


@@ -149,3 +151,4 @@ void QPollingFileSystemWatcherEngine::timeout()
 }
 
 QT_END_NAMESPACE
 }
 
 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 e50082c..926c3ba 100644 (file)
--- a/src/corelib/io/qfilesystemwatcher_polling_p.h
+++ b/src/corelib/io/qfilesystemwatcher_polling_p.h
@@ -62,6 +62,7 @@
 
 #include "qfilesystemwatcher_p.h"
 
 
 #include "qfilesystemwatcher_p.h"
 

+#ifndef QT_NO_FILESYSTEMWATCHER

 QT_BEGIN_NAMESPACE
 
 enum { PollingInterval = 1000 };
 QT_BEGIN_NAMESPACE
 
 enum { PollingInterval = 1000 };


@@ -122,6 +123,6 @@ private:
 };
 
 QT_END_NAMESPACE
 };
 
 QT_END_NAMESPACE

-
+#endif // !QT_NO_FILESYSTEMWATCHER

 #endif // QFILESYSTEMWATCHER_POLLING_P_H
 
 #endif // QFILESYSTEMWATCHER_POLLING_P_H