[Pkg-owncloud-commits] [owncloud-client] 97/175: Disable the curruption workaround on mac and windows

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 3754e6c781203a9a2fb0a30ec13fc0dd2a098411
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri May 22 14:19:41 2015 +0200

    Disable the curruption workaround on mac and windows
    
    The binaries we ship have a patched Qt
---
 src/libsync/propagateupload.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index 05e9774..208e632 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -97,10 +97,11 @@ void PUTFileJob::start() {
 
     // For Qt versions not including https://codereview.qt-project.org/110150
     // Also do the runtime check if compiled with an old Qt but running with fixed one.
+    // (workaround disabled on windows and mac because the binaries we ship have patched qt)
 #if QT_VERSION < QT_VERSION_CHECK(4, 8, 7)
     if (QLatin1String(qVersion()) < QLatin1String("4.8.7"))
         connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort()));
-#elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
+#elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) && !defined Q_OS_WIN && !defined Q_OS_MAC
     if (QLatin1String(qVersion()) < QLatin1String("5.4.2"))
         connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort()));
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git