diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-07 16:36:49 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-07 16:36:49 (GMT) |
| commit | 415ad7b69d364c41156d35b98790b02667a6671b (patch) | |
| tree | 759b02134da808773a1d68eecf2eb5c0ff12167c /src/plugins/bearer/connman/qconnmanengine.h | |
| parent | 3c18c2a43260a271f8a13e89053eede15d399005 (diff) | |
| parent | 703d85e8991e2061062f6d7c695cdeb45d9661fd (diff) | |
| download | Qt-415ad7b69d364c41156d35b98790b02667a6671b.zip Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.gz Qt-415ad7b69d364c41156d35b98790b02667a6671b.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/plugins/bearer/connman/qconnmanengine.h')
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/bearer/connman/qconnmanengine.h b/src/plugins/bearer/connman/qconnmanengine.h index 2ee6da5..569bbc7 100644 --- a/src/plugins/bearer/connman/qconnmanengine.h +++ b/src/plugins/bearer/connman/qconnmanengine.h @@ -137,7 +137,8 @@ private: QMap<QString,QStringList> deviceMap; //tech path, device path QMap<QString, QString> serviceNetworks; //service, network - + QNetworkConfiguration::BearerType ofonoTechToBearerType(const QString &type); + bool isRoamingAllowed(const QString &context); protected: bool requiresPolling() const; QConnmanConnectThread *connThread; |