From 3430e7ce7787cf1c1b1472a0ce0e8770dbff0a7c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 27 Jan 2015 18:41:32 +0100 Subject: Add libproxy backend for QNetworkProxyFactory It will be used on Unix systems if the required dev package is present. (Detected by a configure compile test.) You can configure with -no-libproxy to avoid the dependency. It will not be used on OS X or Windows, as we already implement the native API for getting proxies there. Currently we use whatever PAC runner is provided by the distro for running PAC scripts - if we want to run PAC scripts using Qt, then we would have to implement a pacrunner plugin to libproxy. Note that their webkit pacrunner is using javascriptcore already. Tested using the libproxy 0.4.7 that is included in Ubuntu 12.04. Re-tested using Ubuntu 14.04 which ships libproxy 0.4.11. It works except when both socks and http proxies are configured in the manual settings - in that case libproxy returns only the socks proxy. This seems to be covered by libproxy issue 119. [ChangeLog][QtNetwork] Introduce libproxy backend for Unix platforms, enabled automatically if the required dev package is present Task-number: QTBUG-26295 Change-Id: I521c0a198fcf482386ea8a189114a0077778265c Reviewed-by: Richard J. Moore --- src/network/kernel/kernel.pri | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/network/kernel/kernel.pri') diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index 9b584be206..4f1527c8e9 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -54,7 +54,12 @@ mac { mac:!ios:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp -else:blackberry:SOURCES += kernel/qnetworkproxy_blackberry.cpp +else:blackberry { + SOURCES += kernel/qnetworkproxy_blackberry.cpp + LIBS_PRIVATE += -lbps +} +else:contains(QT_CONFIG, libproxy) { + SOURCES += kernel/qnetworkproxy_libproxy.cpp + LIBS += -lproxy +} else:SOURCES += kernel/qnetworkproxy_generic.cpp - -blackberry: LIBS_PRIVATE += -lbps -- cgit v1.2.3