diff --git a/src/main.cpp b/src/main.cpp index f4dfa794b..f9e141f51 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,8 +36,12 @@ #ifndef DISABLE_GUI #if defined(QBT_STATIC_QT) #include +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +Q_IMPORT_PLUGIN(QICOPlugin) +#else Q_IMPORT_PLUGIN(qico) #endif +#endif #include #include #include diff --git a/src/qtlibtorrent/qbtsession.h b/src/qtlibtorrent/qbtsession.h index 0c89e6010..c0bf51e0b 100755 --- a/src/qtlibtorrent/qbtsession.h +++ b/src/qtlibtorrent/qbtsession.h @@ -30,6 +30,7 @@ #ifndef __BITTORRENT_H__ #define __BITTORRENT_H__ +#include #include #include #include diff --git a/src/tracker/qtracker.cpp b/src/tracker/qtracker.cpp index fd6349ee2..1b1d419b5 100644 --- a/src/tracker/qtracker.cpp +++ b/src/tracker/qtracker.cpp @@ -31,6 +31,9 @@ #include #include #include +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +#include +#endif #include #include @@ -109,8 +112,13 @@ void QTracker::readRequest() // OK, this is a GET request // Parse GET parameters QHash get_parameters; - QUrl url = QUrl::fromEncoded(http_request.path().toAscii()); + QUrl url = QUrl::fromEncoded(http_request.path().toLatin1()); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QUrlQuery query(url); + QListIterator > i(query.queryItems()); +#else QListIterator > i(url.queryItems()); +#endif while (i.hasNext()) { QPair pair = i.next(); get_parameters[pair.first] = pair.second; diff --git a/src/webui/httprequestparser.cpp b/src/webui/httprequestparser.cpp index 3ccf7f602..04ee3870f 100644 --- a/src/webui/httprequestparser.cpp +++ b/src/webui/httprequestparser.cpp @@ -31,6 +31,9 @@ #include "httprequestparser.h" #include +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) +#include +#endif #include HttpRequestParser::HttpRequestParser(): m_error(false) @@ -69,11 +72,16 @@ void HttpRequestParser::writeHeader(const QByteArray& ba) { m_error = false; // Parse header m_header = QHttpRequestHeader(ba); - QUrl url = QUrl::fromEncoded(m_header.path().toAscii()); + QUrl url = QUrl::fromEncoded(m_header.path().toLatin1()); m_path = url.path(); // Parse GET parameters +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QUrlQuery query(url); + QListIterator > i(query.queryItems()); +#else QListIterator > i(url.queryItems()); +#endif while (i.hasNext()) { QPair pair = i.next(); m_getMap[pair.first] = pair.second; @@ -102,8 +110,14 @@ void HttpRequestParser::writeMessage(const QByteArray& ba) { // Parse POST data if (m_header.contentType() == "application/x-www-form-urlencoded") { QUrl url; +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) + QString tmp(m_data); + QUrlQuery query(tmp); + QListIterator > i(query.queryItems()); +#else url.setEncodedQuery(m_data); QListIterator > i(url.queryItems()); +#endif while (i.hasNext()) { QPair pair = i.next(); m_postMap[pair.first] = pair.second;