Merge with feature-crashreport

--HG--
branch : feature-crashreport+develop
This commit is contained in:
kaetemi 2015-02-24 17:19:41 +01:00
commit 4dd5955484

View file

@ -21,6 +21,9 @@
#include <QUrl> #include <QUrl>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
# include <QUrlQuery>
#endif
class CCrashReportSocketPvt class CCrashReportSocketPvt
{ {
@ -43,7 +46,11 @@ CCrashReportSocket::~CCrashReportSocket()
void CCrashReportSocket::sendReport( const SCrashReportData &data ) void CCrashReportSocket::sendReport( const SCrashReportData &data )
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QUrlQuery params;
#else
QUrl params; QUrl params;
#endif
params.addQueryItem( "report", data.report ); params.addQueryItem( "report", data.report );
params.addQueryItem( "descr", data.description ); params.addQueryItem( "descr", data.description );
params.addQueryItem("email", data.email); params.addQueryItem("email", data.email);
@ -52,7 +59,13 @@ void CCrashReportSocket::sendReport( const SCrashReportData &data )
QNetworkRequest request( url ); QNetworkRequest request( url );
request.setRawHeader( "Connection", "close" ); request.setRawHeader( "Connection", "close" );
m_pvt->mgr.post( request, params.encodedQuery() ); #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
QByteArray postData = params.query(QUrl::FullyEncoded).toUtf8();
#else
QByteArray postData = params.encodedQuery();
#endif
m_pvt->mgr.post(request, postData);
} }
void CCrashReportSocket::onFinished( QNetworkReply *reply ) void CCrashReportSocket::onFinished( QNetworkReply *reply )