Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/gui/share.h

README.md

@@ -4,7 +4,7 @@
 |-----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | client-build-matrix               | [![Build Status](https://ci.owncloud.org/job/client-build-matrix-linux/badge/icon)](https://ci.owncloud.org/job/client-build-matrix-linux/)                       |
 | client-test-matrix-linux-no-build | [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=client-test-matrix-linux-no-build)](https://ci.owncloud.org/job/client-test-matrix-linux-no-build/) |
-    
+| coverity_scan | [![Build Status](https://img.shields.io/coverity/scan/2482.svg)](https://scan.coverity.com/projects/owncloud-mirall)
 
 ## Introduction
 

cmake/modules/QtVersionAbstraction.cmake

@@ -22,7 +22,9 @@ if( Qt5Core_FOUND )
         find_package(Qt5WebKitWidgets REQUIRED)
         find_package(Qt5WebKit REQUIRED)
         find_package(Qt5PrintSupport REQUIRED)
-        find_package(Qt5Quick REQUIRED)
+        if(NOT APPLE)
+            find_package(Qt5Quick REQUIRED) # only needed on Windows because of OBS dependencies(?)
+        endif()
         find_package(Qt5Widgets REQUIRED)
         if(APPLE)
            find_package(Qt5MacExtras REQUIRED)

doc/autoupdate.rst

@@ -89,7 +89,7 @@ To prevent automatic updates and disallow manual overrides:
 
 1. Edit this Registry key:
 
-	HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud
+    ``HKEY_LOCAL_MACHINE\Software\Policies\ownCloud\ownCloud``
 
 2. Add the key ``skipUpdateCheck`` (of type DWORD).
 

src/gui/share.h

@@ -22,7 +22,7 @@
 #include <QList>
 #include <QSharedPointer>
 #include <QUrl>
-#include <QVariant>
+#include <QVariantMap>
 
 namespace OCC {
 

sync-exclude.lst

@@ -34,3 +34,4 @@ desktop.ini
 .symform-store
 .fuse_hidden*
 *.unison
+.nfs*