From 5afce9327f71b4eab2b2407784898f6dd94c8d65 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 24 Apr 2012 14:43:37 -0400 Subject: [PATCH] Fix proxying (on Qt 4.8? With current OpenSSH?) --- src/libtomahawk/utils/tomahawkutils.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp index be219786f..5f1039df6 100644 --- a/src/libtomahawk/utils/tomahawkutils.cpp +++ b/src/libtomahawk/utils/tomahawkutils.cpp @@ -350,8 +350,12 @@ void NetworkProxyFactory::setProxy( const QNetworkProxy& proxy ) { m_proxy = proxy; - if ( !TomahawkSettings::instance()->proxyDns() ) - m_proxy.setCapabilities( QNetworkProxy::TunnelingCapability | QNetworkProxy::ListeningCapability | QNetworkProxy::UdpTunnelingCapability ); + QFlags< QNetworkProxy::Capability > proxyCaps; + proxyCaps |= QNetworkProxy::TunnelingCapability; + proxyCaps |= QNetworkProxy::ListeningCapability; + if ( TomahawkSettings::instance()->proxyDns() ) + proxyCaps |= QNetworkProxy::HostNameLookupCapability; + m_proxy.setCapabilities( proxyCaps ); tDebug() << Q_FUNC_INFO << "Proxy using host" << proxy.hostName() << "and port" << proxy.port(); tDebug() << Q_FUNC_INFO << "setting proxy to use proxy DNS?" << (TomahawkSettings::instance()->proxyDns() ? "true" : "false"); }