diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-10-25 10:04:53 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-30 16:32:54 (GMT) |
| commit | 09264c709ea68e585c1f8c479095ebf8420e6e11 (patch) | |
| tree | 2d975dad6f8904effe5cff5c5d8f129c52d9a667 /tests/auto | |
| parent | 88be388557cb164eff3436973a57ba5914f4ad3b (diff) | |
| download | Qt-09264c709ea68e585c1f8c479095ebf8420e6e11.zip Qt-09264c709ea68e585c1f8c479095ebf8420e6e11.tar.gz Qt-09264c709ea68e585c1f8c479095ebf8420e6e11.tar.bz2 | |
QNX: Use inotify on QNX systems that support it
This is a backport of
qtbase commit fc0cbef59599174589a606838a9b55ba6a07ef06
Change-Id: I27ca7222ed0e622bdae405f0802ab29e22f4cbbf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index 313ff6f..cb87b95 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -108,6 +108,9 @@ tst_QFileSystemWatcher::tst_QFileSystemWatcher() // we have native engines for win32, macosx and freebsd do_force_engines << "native"; #endif +#if defined(Q_OS_QNX) && !defined(QT_NO_INOTIFY) + do_force_engines << "native"; +#endif } void tst_QFileSystemWatcher::basicTest_data() @@ -206,6 +209,9 @@ void tst_QFileSystemWatcher::basicTest() // change the permissions, should get a signal from the watcher testFile.setPermissions(QFile::ReadOwner); + // IN_ATTRIB doesn't work on QNX, so skip this test +#if !defined(Q_OS_QNX) + // qDebug() << "waiting max 5 seconds for notification for file permission modification to trigger(1)"; timer.start(5000); eventLoop.exec(); @@ -216,6 +222,8 @@ void tst_QFileSystemWatcher::basicTest() fileName = changedSpy.at(0).at(0).toString(); QCOMPARE(fileName, testFile.fileName()); +#endif + changedSpy.clear(); // remove the watch and modify file permissions, should not get a signal from the watcher |