diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
| commit | 423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch) | |
| tree | 35e27c69dee1d96775f4a921e93f5cd2e574a834 /src/plugins/bearer/icd/qicdengine.h | |
| parent | a9b6c59857c28f48e093abccaf9a89755b0995bc (diff) | |
| parent | 444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff) | |
| download | Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2 | |
Merge branch '4.7' of ../oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/bearer/icd/qicdengine.h')
| -rw-r--r-- | src/plugins/bearer/icd/qicdengine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/bearer/icd/qicdengine.h b/src/plugins/bearer/icd/qicdengine.h index 2f9f8ed..1b291eb 100644 --- a/src/plugins/bearer/icd/qicdengine.h +++ b/src/plugins/bearer/icd/qicdengine.h @@ -69,11 +69,11 @@ public: QString service_type; QString service_id; - uint32_t service_attrs; + quint32 service_attrs; // Network attributes for this IAP, this is the value returned by icd and // passed to it when connecting. - uint32_t network_attrs; + quint32 network_attrs; }; inline IcdNetworkConfigurationPrivate *toIcdConfig(QNetworkConfigurationPrivatePointer ptr) |