Changeset 846 for trunk/src/network/kernel/qnetworkproxy_mac.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/network/kernel/qnetworkproxy_mac.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 158 158 } 159 159 160 if (isHostExcluded(dict, query.peerHostName())) 160 if (isHostExcluded(dict, query.peerHostName())) { 161 CFRelease(dict); 161 162 return result; // no proxy for this host 163 162 164 163 165 // is there a PAC enabled? If so, use it first. … … 223 225 } 224 226 227 225 228 return result; 226 229 }
Note:
See TracChangeset
for help on using the changeset viewer.