diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 07:55:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 07:55:35 (GMT) |
| commit | bc98dbff815f9eace168e5683c06d65d6ce9b3d4 (patch) | |
| tree | fa0ecb1a8b0c1118dfaf65521531eac64c7a8e77 /src/plugins/bearer/generic/qgenericengine.h | |
| parent | 02d3230a6b569e848bdae30ac2184613aade64ff (diff) | |
| parent | eb674c0ba34dfb9434c96d4e1376c02287fb367b (diff) | |
| download | Qt-bc98dbff815f9eace168e5683c06d65d6ce9b3d4.zip Qt-bc98dbff815f9eace168e5683c06d65d6ce9b3d4.tar.gz Qt-bc98dbff815f9eace168e5683c06d65d6ce9b3d4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
Diffstat (limited to 'src/plugins/bearer/generic/qgenericengine.h')
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index cdbbc9d..021b35b 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -65,8 +65,6 @@ public: QString getInterfaceFromId(const QString &id); bool hasIdentifier(const QString &id); - QString bearerName(const QString &id); - void connectToId(const QString &id); void disconnectFromId(const QString &id); |