Adding upstream version 1.96.

Signed-off-by: Alf Gaida <agaida@siduction.org>
upstream/1.96
Alf Gaida 8 years ago
parent 356a29f903
commit 11dcc131c7
No known key found for this signature in database
GPG Key ID: CD280A0B4D72827C

3
.gitignore vendored

@ -0,0 +1,3 @@
build/
*.qm
*.kdev4

@ -39,7 +39,7 @@ find_package(
) )
# add version define # add version define
set(SCREENGRAB_VERSION "1.95") set(SCREENGRAB_VERSION "1.96")
set(SCREENGRAB_VERSION_DEV "2.0-beta1") set(SCREENGRAB_VERSION_DEV "2.0-beta1")
# set(DEV_BUILD True) # set(DEV_BUILD True)

@ -18,9 +18,9 @@
#include "modulemanager.h" #include "modulemanager.h"
#ifdef SG_EXT_UPLOADS // #ifdef SG_EXT_UPLOADS
#include "src/modules/uploader/moduleuploader.h" // #include "src/modules/uploader/moduleuploader.h"
#endif // #endif
#ifdef SG_EXT_EDIT #ifdef SG_EXT_EDIT
#include "src/modules/extedit/moduleextedit.h" #include "src/modules/extedit/moduleextedit.h"
@ -35,10 +35,10 @@ ModuleManager::ModuleManager()
void ModuleManager::initModules() void ModuleManager::initModules()
{ {
#ifdef SG_EXT_UPLOADS //#ifdef SG_EXT_UPLOADS
ModuleUploader *uploader = new ModuleUploader(); // ModuleUploader *uploader = new ModuleUploader();
_modules->insert(MOD_UPLOADER , uploader); // _modules->insert(MOD_UPLOADER , uploader);
#endif //#endif
#ifdef SG_EXT_EDIT #ifdef SG_EXT_EDIT
ModuleExtEdit *extedit = new ModuleExtEdit(); ModuleExtEdit *extedit = new ModuleExtEdit();
_modules->insert(MOD_EXT_EDIT.data(), extedit); _modules->insert(MOD_EXT_EDIT.data(), extedit);

Loading…
Cancel
Save