projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2ef1274
)
#ifdef'd QNetworkProxy
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Sat, 5 Apr 2008 21:34:03 +0000
(21:34 +0000)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sat, 5 Apr 2008 21:34:03 +0000
(21:34 +0000)
src/client/clientsyncer.cpp
patch
|
blob
|
history
diff --git
a/src/client/clientsyncer.cpp
b/src/client/clientsyncer.cpp
index
a4a4be8
..
b7b2088
100644
(file)
--- a/
src/client/clientsyncer.cpp
+++ b/
src/client/clientsyncer.cpp
@@
-20,7
+20,9
@@
#include "clientsyncer.h"
#include "clientsyncer.h"
-#include <QNetworkProxy>
+#ifndef QT_NO_NETWORKPROXY
+# include <QNetworkProxy>
+#endif
#include "client.h"
#include "global.h"
#include "client.h"
#include "global.h"
@@
-131,11
+133,12
@@
void ClientSyncer::connectToCore(const QVariantMap &conn) {
}
QTcpSocket *sock = new QTcpSocket(Client::instance());
#endif
}
QTcpSocket *sock = new QTcpSocket(Client::instance());
#endif
-
+#ifndef QT_NO_NETWORKPROXY
if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
sock->setProxy(proxy);
}
if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
sock->setProxy(proxy);
}
+#endif
socket = sock;
connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
socket = sock;
connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));