projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a432a1
)
FolderWatcher: Disable test on OSX #7305
author
Christian Kamm
<mail@ckamm.de>
Tue, 16 Jul 2019 12:23:15 +0000
(14:23 +0200)
committer
Camila (Rebase PR Action)
<hello@camila.codes>
Tue, 24 Nov 2020 16:56:49 +0000
(16:56 +0000)
src/gui/folderwatcher.cpp
patch
|
blob
|
history
diff --git
a/src/gui/folderwatcher.cpp
b/src/gui/folderwatcher.cpp
index 80685e3cf626a2c6eba3aa3917122ff8389d1f58..04d10776bdb2117c2e572dc9e6a9a610ab190a91 100644
(file)
--- a/
src/gui/folderwatcher.cpp
+++ b/
src/gui/folderwatcher.cpp
@@
-89,6
+89,14
@@
void FolderWatcher::appendSubPaths(QDir dir, QStringList& subPaths) {
void FolderWatcher::startNotificatonTest(const QString &path)
{
+#ifdef Q_OS_MAC
+ // Testing the folder watcher on OSX is harder because the watcher
+ // automatically discards changes that were performed by our process.
+ // It would still be useful to test but the OSX implementation
+ // is deferred until later.
+ return;
+#endif
+
Q_ASSERT(_testNotificationPath.isEmpty());
_testNotificationPath = path;