[Pkg-owncloud-commits] [owncloud-client] 359/484: Merge remote-tracking branch 'origin/depclean' into 2.1

[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 300c1c2055aece397b074ad6ecf94b66b3202ca2
Merge: fb42183 6123fab
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Nov 18 14:43:41 2015 +0100

    Merge remote-tracking branch 'origin/depclean' into 2.1
    
    Conflicts:
    	cmake/modules/QtVersionAbstraction.cmake

 cmake/modules/QtVersionAbstraction.cmake | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --cc cmake/modules/QtVersionAbstraction.cmake
index 6f222e0,1b744a6..12fe7be
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@@ -21,10 -21,8 +21,6 @@@ if( Qt5Core_FOUND 
      if(NOT TOKEN_AUTH_ONLY)
          find_package(Qt5WebKitWidgets REQUIRED)
          find_package(Qt5WebKit REQUIRED)
-         find_package(Qt5PrintSupport REQUIRED)
-         if(NOT APPLE)
-             find_package(Qt5Quick REQUIRED) # only needed on Windows because of OBS dependencies(?)
-         endif()
 -        find_package(Qt5PrintSupport)
 -        find_package(Qt5Quick)
          find_package(Qt5Widgets REQUIRED)
          if(APPLE)
             find_package(Qt5MacExtras REQUIRED)

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