diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-14 10:05:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-14 10:05:51 (GMT) |
| commit | 93627ef1119e3eadbe2fd6b5d647f0882b3cb91d (patch) | |
| tree | 3e8a7994fa5135b79fb402c1937124138617b354 /header.BSD | |
| parent | 8062464ce3f5fd6eb92f94d1fafa697385de72ce (diff) | |
| parent | 96b54a00927b398ec4372088a9fd57b7144e393b (diff) | |
| download | Qt-93627ef1119e3eadbe2fd6b5d647f0882b3cb91d.zip Qt-93627ef1119e3eadbe2fd6b5d647f0882b3cb91d.tar.gz Qt-93627ef1119e3eadbe2fd6b5d647f0882b3cb91d.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:
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
Diffstat (limited to 'header.BSD')
0 files changed, 0 insertions, 0 deletions