summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfilesystemwatcher_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-01-12 11:40:51 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-12 14:38:18 +0100
commit9834b3681fb02ef5eaab19d678b674365a4381e4 (patch)
tree70b2d8beea25698909a146b2dec5b6e23e74a2fa /src/corelib/io/qfilesystemwatcher_p.h
parent716905cd5675497f0c99e9468bc52ed6e6e25005 (diff)
Make QFileSystemWatcherEngines children of QFileSystemWatcher
To support moving QFileSystemWatcher to another thread, the engines need to follow when the watcher is moved. The easiest way to do this is by parenting the engines to the watcher. Change-Id: Ie2bb701c0c148da9cc2302d4de23286b8ef42c4d Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_p.h')
-rw-r--r--src/corelib/io/qfilesystemwatcher_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_p.h b/src/corelib/io/qfilesystemwatcher_p.h
index 0f1032c445..9f403b308f 100644
--- a/src/corelib/io/qfilesystemwatcher_p.h
+++ b/src/corelib/io/qfilesystemwatcher_p.h
@@ -68,7 +68,8 @@ class QFileSystemWatcherEngine : public QObject
Q_OBJECT
protected:
- inline QFileSystemWatcherEngine()
+ inline QFileSystemWatcherEngine(QObject *parent)
+ : QObject(parent)
{
}
@@ -94,7 +95,7 @@ class QFileSystemWatcherPrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QFileSystemWatcher)
- static QFileSystemWatcherEngine *createNativeEngine();
+ static QFileSystemWatcherEngine *createNativeEngine(QObject *parent);
public:
QFileSystemWatcherPrivate();