Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'avoid_vpn_warning' into 'mer-5.6'
[qtbase] Avoid warning on vpn connection type. Contributes to JB#51275

See merge request mer-core/qtbase!70
  • Loading branch information
pvuorela committed Dec 14, 2020
2 parents 09e2e31 + 28ce24e commit 02dccd4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/plugins/bearer/connman/qconnmanengine.cpp
Expand Up @@ -490,7 +490,7 @@ QNetworkConfiguration::BearerType QConnmanEngine::ofonoTechToBearerType(const QS
return QNetworkConfiguration::BearerHSPA;
} else if (currentTechnology == QLatin1String("lte")) {
return QNetworkConfiguration::BearerLTE;
} else {
} else if (currentTechnology != QLatin1String("vpn")) { // we know this exists, but can't map it. warn for others
qCWarning(qLcLibBearer) << "QConnmanEngine: Unable to translate the bearer type of the unknown network technology:" << currentTechnology;
}
} else {
Expand Down

0 comments on commit 02dccd4

Please sign in to comment.