diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 19:18:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 19:18:56 +1000 |
| commit | 4bd181fb5abc4c85e4f097262d36a409258b1561 (patch) | |
| tree | 802b6ef18d4cd23eadda9e41d0988b69e0118590 /examples/opengl/cube/geometryengine.cpp | |
| parent | acc98b9b36c61bb661701cd98d70d2ebae4ee2f6 (diff) | |
| parent | df2d6753acff2dde79f99effc1a779f5c7f0a2c0 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
tst_qhostinfo: Fix IPv6 lookup detection on Windows.
Fix incorrect hardware address on systems without getifaddrs()
Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
Diffstat (limited to 'examples/opengl/cube/geometryengine.cpp')
0 files changed, 0 insertions, 0 deletions