summaryrefslogtreecommitdiffstats
path: root/doc/src/porting/porting4.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-02 07:55:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-02 07:55:35 (GMT)
commitbc98dbff815f9eace168e5683c06d65d6ce9b3d4 (patch)
treefa0ecb1a8b0c1118dfaf65521531eac64c7a8e77 /doc/src/porting/porting4.qdoc
parent02d3230a6b569e848bdae30ac2184613aade64ff (diff)
parenteb674c0ba34dfb9434c96d4e1376c02287fb367b (diff)
downloadQt-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 'doc/src/porting/porting4.qdoc')
0 files changed, 0 insertions, 0 deletions