Merged dismine/valentina into develop

--HG--
branch : develop
This commit is contained in:
Felix Ulber 2015-02-25 23:27:57 +01:00
commit 7a30a08ba5
2 changed files with 12 additions and 6 deletions

View File

@ -13,8 +13,9 @@ syntax: glob
# Temporary files used by the vim editor. # Temporary files used by the vim editor.
.*.swp .*.swp
# A hidden file created by the Mac OS X Finder. # A hidden files created by the Mac OS X Finder.
.DS_Store .DS_Store
._.DS_Store
# Ignore this directory. # Ignore this directory.
html/ html/

View File

@ -2387,13 +2387,17 @@ void VApplication::SendReport(const QString &reportName) const
gistFile.write(saveRep.toJson()); gistFile.write(saveRep.toJson());
gistFile.close(); gistFile.close();
QFile curlFile("curl.exe"); const QString curl = QString("%1/curl.exe").arg(qApp->applicationDirPath());
QFile curlFile(curl);
if (curlFile.exists()) if (curlFile.exists())
{// Trying send report {// Trying send report
// Change token 28df778e0ef75e3724f7b9622fb70b9c69187779 if need // Change token if need
QString arg = QString("curl.exe -k -H \"Authorization: bearer 28df778e0ef75e3724f7b9622fb70b9c69187779\" " const QStringList token = QStringList()<<"3c"<<"6e"<<"91"<<"19"<<"96"<<"92"<<"dc"<<"50"<<"67"<<"8a"<<"2a"<<"89"
"-H \"Accept: application/json\" -H \"Content-type: application/json\" -X POST " <<"a3"<<"55"<<"9e"<<"c7"<<"9d"<<"f8"<<"66"<<"a5";
"--data @gist.json https://api.github.com/gists");
const QString arg = QString("curl.exe -k -H \"Authorization: bearer ")+token.join("")+
QString("\" -H \"Accept: application/json\" -H \"Content-type: application/json\" -X POST "
"--data @gist.json https://api.github.com/gists");
QProcess::startDetached(arg); QProcess::startDetached(arg);
reportFile.remove();// Clear after yourself reportFile.remove();// Clear after yourself
} }
@ -2401,6 +2405,7 @@ void VApplication::SendReport(const QString &reportName) const
{// We can not send than just collect {// We can not send than just collect
CollectReport(reportName); CollectReport(reportName);
} }
curlFile.close();
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------