Mercurial Repositories > eric / changeset
changeset
Merged with default branch.
Mon, 18 Feb 2019 19:17:04 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 18 Feb 2019 19:17:04 +0100
- branch
- pypi
- changeset 6784
- f5d29245dbb9
- parent 6782
- 390a45748883 (current diff)
- parent 6783
- d8a0d75aaf01 (diff)
- child 6785
- 058d63c537a4
Merged with default branch.
| eric6.e4p | file | annotate | diff | comparison | revisions |
--- a/UI/UserInterface.py Sun Feb 17 19:19:30 2019 +0100 +++ b/UI/UserInterface.py Mon Feb 18 19:17:04 2019 +0100 @@ -212,10 +212,10 @@ self.restoreGeometry(g) self.__startup = True - self.__proxyFactory = E5NetworkProxyFactory() if Preferences.getUI("UseSystemProxy"): QNetworkProxyFactory.setUseSystemConfiguration(True) else: + self.__proxyFactory = E5NetworkProxyFactory() QNetworkProxyFactory.setApplicationProxyFactory( self.__proxyFactory) QNetworkProxyFactory.setUseSystemConfiguration(False) @@ -5873,6 +5873,7 @@ if Preferences.getUI("UseSystemProxy"): QNetworkProxyFactory.setUseSystemConfiguration(True) else: + self.__proxyFactory = E5NetworkProxyFactory() QNetworkProxyFactory.setApplicationProxyFactory( self.__proxyFactory) QNetworkProxyFactory.setUseSystemConfiguration(False)
--- a/eric6.e4p Sun Feb 17 19:19:30 2019 +0100 +++ b/eric6.e4p Mon Feb 18 19:17:04 2019 +0100 @@ -471,7 +471,6 @@ <Source>Network/IRC/IrcWidget.py</Source> <Source>Network/IRC/__init__.py</Source> <Source>Network/__init__.py</Source> - <Source>PipInterface/ConfigurationPage/__init__.py</Source> <Source>PipInterface/Pip.py</Source> <Source>PipInterface/PipDialog.py</Source> <Source>PipInterface/PipFileSelectionDialog.py</Source>
