[Pkg-owncloud-commits] [owncloud-client] 211/333: Merge branch 'master' of github.com:shadone/mirall into shadone-master
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:54 UTC 2014
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 45ec489f71a96c92ba7fbd9514e3186be7fc65bd
Merge: 1b5e14f a51cb09
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Tue Mar 25 19:06:12 2014 +0100
Merge branch 'master' of github.com:shadone/mirall into shadone-master
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
src/CMakeLists.txt
src/mirall/owncloudgui.cpp
.gitmodules | 3 +
cmake/modules/QtVersionAbstraction.cmake | 12 +++-
src/3rdparty/qtmacgoodies | 1 +
src/CMakeLists.txt | 22 +++++-
src/mirall/accountsettings.cpp | 19 +++++-
src/mirall/owncloudgui.cpp | 15 +++-
src/mirall/owncloudgui.h | 5 ++
src/mirall/protocolwidget.cpp | 3 +
src/mirall/settingsdialogmac.cpp | 113 +++++++++++++++++++++++++++++++
src/mirall/settingsdialogmac.h | 45 ++++++++++++
src/mirall/utility.cpp | 12 ++--
11 files changed, 236 insertions(+), 14 deletions(-)
diff --cc cmake/modules/QtVersionAbstraction.cmake
index bba1a2b,daf53a0..bc55549
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@@ -7,15 -7,18 +7,18 @@@ option(BUILD_WITH_QT4 "Build with Qt4 n
if( NOT BUILD_WITH_QT4 )
find_package(Qt5Core QUIET)
if( Qt5Core_DIR )
- find_package(Qt5Widgets QUIET)
- find_package(Qt5Quick QUIET)
- find_package(Qt5PrintSupport QUIET)
- find_package(Qt5WebKit QUIET)
- find_package(Qt5Location QUIET)
- find_package(Qt5Network QUIET)
- find_package(Qt5Sensors QUIET)
- find_package(Qt5Xml QUIET)
-# find_package(Qt5WebKitWidgets QUIET)
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Quick REQUIRED)
+ find_package(Qt5PrintSupport REQUIRED)
+ find_package(Qt5WebKit REQUIRED)
+ find_package(Qt5Network REQUIRED)
+ find_package(Qt5Sensors REQUIRED)
+ find_package(Qt5Xml REQUIRED)
- # find_package(Qt5Location REQUIRED)
- # find_package(Qt5WebKitWidgets REQUIRED)
++ find_package(Qt5Location REQUIRED)
++ find_package(Qt5WebKitWidgets REQUIRED)
+ if(APPLE)
- find_package(Qt5MacExtras QUIET)
++ find_package(Qt5MacExtras REQUIRED))
+ endif()
message(STATUS "Using Qt 5!")
@@@ -28,11 -31,14 +31,16 @@@
include_directories(${Qt5Widgets_INCLUDES})
add_definitions(${Qt5Widgets_DEFINITIONS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ if (NOT WIN32) #implied on Win32
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ endif(NOT WIN32)
# set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ if(APPLE)
+ include_directories(${Qt5MacExtras_INCLUDE_DIRS})
+ add_definitions(${Qt5MacExtras_DEFINITIONS})
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ endif()
macro(qt_wrap_ui)
qt5_wrap_ui(${ARGN})
diff --cc src/CMakeLists.txt
index 6aa438a,3a4260e..8144033
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -94,29 -106,49 +111,27 @@@ set(libsync_SRC
creds/credentialscommon.cpp
3rdparty/qjson/json.cpp
)
-
-set(libsync_HEADERS
- mirall/folderman.h
- mirall/folder.h
- mirall/folderwatcher.h
- mirall/csyncthread.h
- mirall/owncloudpropagator.h
- mirall/owncloudpropagator_p.h
- mirall/syncjournaldb.h
- mirall/theme.h
- mirall/owncloudtheme.h
- mirall/logger.h
- mirall/connectionvalidator.h
- mirall/progressdispatcher.h
- mirall/mirallaccessmanager.h
- mirall/networkjobs.h
- mirall/account.h
- mirall/quotainfo.h
- mirall/clientproxy.h
- creds/abstractcredentials.h
- creds/dummycredentials.h
- creds/httpcredentials.h
- creds/credentialsfactory.h
- creds/http/httpconfigfile.h
- creds/shibbolethcredentials.h
- creds/shibboleth/shibbolethaccessmanager.h
- creds/shibboleth/shibbolethcookiejar.h
- creds/shibboleth/shibbolethwebview.h
- creds/shibboleth/shibbolethrefresher.h
- creds/shibboleth/shibbolethconfigfile.h
- creds/credentialscommon.h
- 3rdparty/qjson/json.h
-)
+if(TOKEN_AUTH_ONLY)
+ set (libsync_SRCS
+ ${libsync_SRCS}
+ creds/tokencredentials.cpp
+ )
+ else()
+ set (libsync_SRCS
+ ${libsync_SRCS}
+ creds/httpcredentials.cpp
+ creds/shibbolethcredentials.cpp
+ creds/shibboleth/shibbolethaccessmanager.cpp
+ creds/shibboleth/shibbolethcookiejar.cpp
+ creds/shibboleth/shibbolethwebview.cpp
+ creds/shibboleth/shibbolethrefresher.cpp
+ creds/shibboleth/shibbolethconfigfile.cpp
+ creds/shibboleth/authenticationdialog.cpp
+ )
+endif()
-
-
IF( NOT WIN32 AND NOT APPLE )
set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_linux.cpp)
- set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_linux.h)
ENDIF()
IF( WIN32 )
set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_win.cpp)
diff --cc src/mirall/owncloudgui.cpp
index c8f96b3,56d5351..f93abfd
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@@ -450,10 -477,19 +454,17 @@@ void ownCloudGui::slotShowGuiMessage(co
void ownCloudGui::slotShowSettings()
{
if (_settingsDialog.isNull()) {
- _settingsDialog = new SettingsDialog(this);
+ _settingsDialog =
+ #if defined(Q_OS_MAC)
+ new SettingsDialogMac(this);
+ #else
+ new SettingsDialog(this);
+ #endif
+ _settingsDialog->setAttribute( Qt::WA_DeleteOnClose, true );
+ _settingsDialog->show();
}
-
_settingsDialog->setGeneralErrors( _startupFails );
Utility::raiseDialog(_settingsDialog.data());
- _settingsDialog->slotRefreshResultList();
}
void ownCloudGui::slotShowSyncProtocol()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list