diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-06 12:18:40 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-02-08 10:40:33 +0000 |
| commit | 4fb7eb0da74798205f5cac693c921065492fa33e (patch) | |
| tree | 2082182e4b640ef9233d1bd9108caccd30a5edb7 /src/network | |
| parent | 21861e6fd1fcd1e4642f3d4c06ee7181d2c81778 (diff) | |
Drop most "#ifndef QT_NO_LIBRARY"
As we can load plugins without QLibrary now, we don't have to #ifdef
out the code that does so anymore.
Change-Id: I1dc20216830a882dbd5a1b431183407e6b19c837
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager_p.cpp b/src/network/bearer/qnetworkconfigmanager_p.cpp index 336233c5d8..3101a98165 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.cpp +++ b/src/network/bearer/qnetworkconfigmanager_p.cpp @@ -367,10 +367,8 @@ void QNetworkConfigurationManagerPrivate::configurationChanged(QNetworkConfigura void QNetworkConfigurationManagerPrivate::updateConfigurations() { -#ifndef QT_NO_LIBRARY typedef QMultiMap<int, QString> PluginKeyMap; typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator; -#endif QMutexLocker locker(&mutex); if (firstUpdate) { @@ -379,7 +377,6 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations() updating = false; -#ifndef QT_NO_LIBRARY bool envOK = false; const int skipGeneric = qEnvironmentVariableIntValue("QT_EXCLUDE_GENERIC_BEARER", &envOK); QBearerEngine *generic = 0; @@ -421,7 +418,6 @@ void QNetworkConfigurationManagerPrivate::updateConfigurations() if (!envOK || skipGeneric <= 0) sessionEngines.append(generic); } -#endif // QT_NO_LIBRARY } QBearerEngine *engine = qobject_cast<QBearerEngine *>(sender()); |