Fix patches
Try to fix the patches
This commit is contained in:
parent
292bee7075
commit
a96956cb42
16
debian/patches/core-cli-upload-option.patch
vendored
16
debian/patches/core-cli-upload-option.patch
vendored
@ -5,19 +5,17 @@ Last-Update: 2016-09-19
|
|||||||
|
|
||||||
--- a/src/core/core.cpp
|
--- a/src/core/core.cpp
|
||||||
+++ b/src/core/core.cpp
|
+++ b/src/core/core.cpp
|
||||||
@@ -535,8 +535,9 @@ void Core::processCmdLineOpts(const QStr
|
@@ -534,7 +534,7 @@ void Core::processCmdLineOpts(const QStringList& arguments)
|
||||||
|
for (int i=0; i < _screenTypeOpts.count(); ++i)
|
||||||
if (_cmdLine.isSet(_screenTypeOpts.at(i)))
|
if (_cmdLine.isSet(_screenTypeOpts.at(i)))
|
||||||
_conf->setDefScreenshotType(i);
|
_conf->setDefScreenshotType(i);
|
||||||
|
-
|
||||||
+/*
|
+/*
|
||||||
#ifdef SG_EXT_UPLOADS
|
#ifdef SG_EXT_UPLOADS
|
||||||
- /// FIXMA - In module interface need add the mthod for geting module cmdLine options
|
/// FIXMA - In module interface need add the mthod for geting module cmdLine options
|
||||||
+ /// FIXMA - In module interface need add the mthod for geting module cmdLine option
|
const QString UPLOAD_CMD_PARAM = QStringLiteral("upload");
|
||||||
const QString UPLOAD_CMD_PARAM = "upload";
|
@@ -550,6 +550,9 @@ void Core::processCmdLineOpts(const QStringList& arguments)
|
||||||
const QString UPLOAD_CMD_PARAM_SHORT = "u";
|
#else
|
||||||
QCommandLineOption u(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM);
|
|
||||||
@@ -548,6 +549,9 @@ void Core::processCmdLineOpts(const QStr
|
|
||||||
} else
|
|
||||||
initWindow();
|
initWindow();
|
||||||
#endif
|
#endif
|
||||||
+*/
|
+*/
|
||||||
|
@ -5,17 +5,12 @@ Last-Update: 2016-09-19
|
|||||||
|
|
||||||
--- a/src/modules/uploader/moduleuploader.cpp
|
--- a/src/modules/uploader/moduleuploader.cpp
|
||||||
+++ b/src/modules/uploader/moduleuploader.cpp
|
+++ b/src/modules/uploader/moduleuploader.cpp
|
||||||
@@ -36,11 +36,11 @@ const QString UPLOAD_CMD_PARAM_SHORT = "
|
@@ -40,7 +40,7 @@ ModuleUploader::ModuleUploader(QObject *parent) :
|
||||||
|
|
||||||
ModuleUploader::ModuleUploader(QObject *parent) :
|
|
||||||
QObject(parent), _ignoreCmdParam(false),
|
|
||||||
- _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM)
|
|
||||||
+ _optUpload(QStringList() << UPLOAD_CMD_PARAM_SHORT << UPLOAD_CMD_PARAM)
|
|
||||||
{
|
{
|
||||||
QString optUploadDescr = tr("Upload the screenshot to the default image host");
|
QString optUploadDescr = tr("Upload the screenshot to the default image host");
|
||||||
_optUpload.setDescription(optUploadDescr);
|
_optUpload.setDescription(optUploadDescr);
|
||||||
- Core::instance()->addCmdLineOption(_optUpload);
|
- Core::instance()->addCmdLineOption(_optUpload);
|
||||||
+ /* Core::instance()->addCmdLineOption(_optUpload); */
|
+ // Core::instance()->addCmdLineOption(_optUpload);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ModuleUploader::moduleName()
|
QString ModuleUploader::moduleName()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user