From 11dcc131c73df24e73d62e46e47a5f0e3a87fa1e Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 18 Oct 2016 23:36:32 +0200 Subject: [PATCH] Adding upstream version 1.96. Signed-off-by: Alf Gaida --- .gitignore | 3 +++ CMakeLists.txt | 2 +- src/core/modulemanager.cpp | 14 +++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..41b1005 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build/ +*.qm +*.kdev4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 01ac9d9..51c0250 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ find_package( ) # add version define -set(SCREENGRAB_VERSION "1.95") +set(SCREENGRAB_VERSION "1.96") set(SCREENGRAB_VERSION_DEV "2.0-beta1") # set(DEV_BUILD True) diff --git a/src/core/modulemanager.cpp b/src/core/modulemanager.cpp index 8778e93..b35202c 100644 --- a/src/core/modulemanager.cpp +++ b/src/core/modulemanager.cpp @@ -18,9 +18,9 @@ #include "modulemanager.h" -#ifdef SG_EXT_UPLOADS -#include "src/modules/uploader/moduleuploader.h" -#endif +// #ifdef SG_EXT_UPLOADS +// #include "src/modules/uploader/moduleuploader.h" +// #endif #ifdef SG_EXT_EDIT #include "src/modules/extedit/moduleextedit.h" @@ -35,10 +35,10 @@ ModuleManager::ModuleManager() void ModuleManager::initModules() { -#ifdef SG_EXT_UPLOADS - ModuleUploader *uploader = new ModuleUploader(); - _modules->insert(MOD_UPLOADER , uploader); -#endif +//#ifdef SG_EXT_UPLOADS +// ModuleUploader *uploader = new ModuleUploader(); +// _modules->insert(MOD_UPLOADER , uploader); +//#endif #ifdef SG_EXT_EDIT ModuleExtEdit *extedit = new ModuleExtEdit(); _modules->insert(MOD_EXT_EDIT.data(), extedit);