[Pkg-owncloud-commits] [owncloud-client] 144/333: Merge remote-tracking branch 'origin/1.5'

[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 33289bde290f13b087c3e3d81bd00c5e88aa496e
Merge: 9053662 07904e0
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Mar 14 17:27:50 2014 +0100

    Merge remote-tracking branch 'origin/1.5'
    
    Conflicts:
    	CMakeLists.txt
    	VERSION.cmake
    	src/CMakeLists.txt

 CMakeLists.txt                              |  27 +++-
 ChangeLog                                   |  18 ++-
 cmake/modules/DefineInstallationPaths.cmake |   4 +
 csync/src/CMakeLists.txt                    |  10 +-
 src/CMakeLists.txt                          | 123 +++++++++-----
 src/creds/credentialsfactory.cpp            |   9 ++
 src/creds/tokencredentials.cpp              | 240 ++++++++++++++++++++++++++++
 src/creds/tokencredentials.h                |  67 ++++++++
 src/mirall/csyncthread.cpp                  |   2 +
 src/mirall/csyncthread.h                    |   5 +
 src/mirall/folderman.cpp                    |   9 +-
 src/mirall/mirallaccessmanager.cpp          |  14 ++
 src/mirall/mirallaccessmanager.h            |   2 +
 src/mirall/networkjobs.cpp                  |   3 +
 14 files changed, 473 insertions(+), 60 deletions(-)

diff --cc CMakeLists.txt
index c188acb,f64e078..f162657
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -78,16 -91,18 +91,20 @@@ option(BUILD_LIBRARIES_ONLY "BUILD_LIBR
  #    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
  #endif()
  find_package(Neon REQUIRED)
- if (Qt5Core_DIR)
-   find_package(Qt5Keychain REQUIRED)
- else()
-   find_package(QtKeychain REQUIRED)
+ 
+ if(NOT TOKEN_AUTH_ONLY)
 -	find_package(QtKeychain REQUIRED)
 -	set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
 -else()	
++    if (Qt5Core_DIR)
++    find_package(Qt5Keychain REQUIRED)
++    else()
++    find_package(QtKeychain REQUIRED)
++    endif()
  endif()
+ 
  Find_package(Sparkle)
  if(UNIX)
 -find_package(INotify REQUIRED)
 +  find_package(INotify REQUIRED)
  else()
 -find_package(INotify)
 +  find_package(INotify)
  endif()
  find_package(Sphinx)
  find_package(PdfLatex)
diff --cc src/CMakeLists.txt
index b783acd,3b6409b..6cd6d36
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -389,13 -417,9 +420,13 @@@ endif(NOT WIN32 AND NOT BUILD_LIBRARIES
      # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
      add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
      qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
- else()
+ elseif(NOT BUILD_LIBRARIES_ONLY)
      set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 -    include(DeployQt4)
 +    if (Qt5Core_FOUND)
 +        include(DeployQt5)
 +    else(Qt5Core_FOUND)
 +        include(DeployQt4)
 +    endif(Qt5Core_FOUND)
  
      set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
      set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
@@@ -434,12 -461,8 +468,12 @@@ endif(
  #FIXME: find a nice solution to make the second if(BUILD_OWNCLOUD_OSX_BUNDLE) unnecessary
  # currently it needs to be done because the code right above needs to be executed no matter
  # if building a bundle or not and the install_qt4_executable needs to be called afterwards
- if(BUILD_OWNCLOUD_OSX_BUNDLE)
+ if(BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
 -    install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite")
 +    if(Qt5Core_FOUND)
 +        install_qt5_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite;qcocoa")
 +    else(Qt5Core_FOUND)
 +        install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qtaccessiblewidgets;qsqlite")
 +    endif(Qt5Core_FOUND)
  endif()
  
  find_program(KRAZY2_EXECUTABLE krazy2)
diff --cc src/mirall/csyncthread.h
index 30ea08d,0b7995b..5eed4cb
--- a/src/mirall/csyncthread.h
+++ b/src/mirall/csyncthread.h
@@@ -63,9 -62,15 +63,14 @@@ signals
      void csyncError( const QString& );
      void csyncWarning( const QString& );
      void csyncUnavailable();
+ 
+     // before actual syncing (after update+reconcile)
+     void syncItemDisconvered(const SyncFileItem&);
+ 
+     // after sync is done
      void treeWalkResult(const SyncFileItemVector&);
  
 -    void transmissionProgress( const Progress::Info& progress );
 -    void transmissionProblem( const Progress::SyncProblem& problem );
 +    void transmissionProgress( const Progress::Kind, const Progress::Info& progress );
  
      void csyncStateDbFile( const QString& );
      void wipeDb();

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