Commit 33e929aa authored by David Faure's avatar David Faure
Browse files

add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation

parent a2a10a4c
...@@ -41,6 +41,8 @@ include(KDECompilerSettings NO_POLICY_SCOPE) ...@@ -41,6 +41,8 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings) include(KDECMakeSettings)
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
find_package(Phonon4Qt5 CONFIG REQUIRED) find_package(Phonon4Qt5 CONFIG REQUIRED)
find_package(Qca-qt5 2.1.0) find_package(Qca-qt5 2.1.0)
set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption" set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption"
......
...@@ -142,7 +142,7 @@ void HttpPoll::connectToHost(const QString &proxyHost, int proxyPort, const QStr ...@@ -142,7 +142,7 @@ void HttpPoll::connectToHost(const QString &proxyHost, int proxyPort, const QStr
d->use_proxy = true; d->use_proxy = true;
} }
else { else {
QUrl u = url; QUrl u(url);
d->host = u.host(); d->host = u.host();
if(u.port() != -1) if(u.port() != -1)
d->port = u.port(); d->port = u.port();
...@@ -189,7 +189,7 @@ QByteArray HttpPoll::makePacket(const QString &ident, const QString &key, const ...@@ -189,7 +189,7 @@ QByteArray HttpPoll::makePacket(const QString &ident, const QString &key, const
int len = cs.length(); int len = cs.length();
QByteArray a; QByteArray a;
a.resize(len + block.size()); a.resize(len + block.size());
memcpy(a.data(), cs.data(), len); memcpy(a.data(), cs.data(), len);
memcpy(a.data() + len, block.data(), block.size()); memcpy(a.data() + len, block.data(), block.size());
return a; return a;
...@@ -530,7 +530,7 @@ void HttpProxyPost::sock_connected() ...@@ -530,7 +530,7 @@ void HttpProxyPost::sock_connected()
d->inHeader = true; d->inHeader = true;
d->headerLines.clear(); d->headerLines.clear();
QUrl u = d->url; QUrl u(d->url);
// connected, now send the request // connected, now send the request
QString s; QString s;
...@@ -785,7 +785,7 @@ void HttpProxyGetStream::sock_connected() ...@@ -785,7 +785,7 @@ void HttpProxyGetStream::sock_connected()
d->inHeader = true; d->inHeader = true;
d->headerLines.clear(); d->headerLines.clear();
QUrl u = d->url; QUrl u(d->url);
// connected, now send the request // connected, now send the request
QString s; QString s;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment