diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-12-14 12:27:11 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-12-14 12:27:11 +0300 |
| commit | fe4bb52a6d5f46259deb2e230cccb4ed61822826 (patch) | |
| tree | 56883af15ee071b20ceaea634eaa3373e3a4d3e3 /src/cmd | |
| parent | 042816bd0d6421f14da2cc1370252ed5230c406c (diff) | |
| parent | f40cceaf04e8ca8f7b2f1eb4ec23c3d043a8951c (diff) | |
Merge remote-tracking branch 'oc/master' into oc_up
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cmd/cmd.cpp | 6 | ||||
| -rw-r--r-- | src/cmd/simplesslerrorhandler.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index f1727d7d1..8a62f0779 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -31,7 +31,7 @@ endif() if(NOT BUILD_LIBRARIES_ONLY) add_executable(${cmd_NAME} ${cmd_SRC}) - qt5_use_modules(${cmd_NAME} Network Sql) + qt5_use_modules(${cmd_NAME} Network ) set_target_properties(${cmd_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) set_target_properties(${cmd_NAME} PROPERTIES diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index 056c748c6..7544ae5cc 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -53,7 +53,7 @@ using namespace OCC; -static void nullMessageHandler(QtMsgType, const char *) +static void nullMessageHandler(QtMsgType, const QMessageLogContext &, const QString &) { } @@ -333,7 +333,7 @@ int main(int argc, char **argv) csync_set_log_level(options.silent ? 1 : 11); if (options.silent) { - qInstallMsgHandler(nullMessageHandler); + qInstallMessageHandler(nullMessageHandler); } else { qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} [ %{type} %{category} ]%{if-debug}\t[ %{function} ]%{endif}:\t%{message}"); } @@ -534,7 +534,7 @@ restart_sync: engine.excludedFiles().addExcludeFilePath(systemExcludeFile); } - if (!engine.excludedFiles().reloadExcludes()) { + if (!engine.excludedFiles().reloadExcludeFiles()) { qFatal("Cannot load system exclude list or list supplied via --exclude"); return EXIT_FAILURE; } diff --git a/src/cmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp index 437438507..b25e9958f 100644 --- a/src/cmd/simplesslerrorhandler.cpp +++ b/src/cmd/simplesslerrorhandler.cpp @@ -11,7 +11,6 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#include "configfile.h" #include "common/utility.h" #include "account.h" #include "simplesslerrorhandler.h" |