summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-22 08:21:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-22 08:21:17 (GMT)
commite6dc532b7061df210f350e9f6cb8ab85e25d7896 (patch)
tree1e5bca8526f2c30e6f2c2496fb74f9488a73b6af /tests
parentafa9e87c6b1cba59c3da025545de88c09ca26130 (diff)
parentaded88bcc706019e3f18cc4a47682d04725a0f3b (diff)
downloadQt-e6dc532b7061df210f350e9f6cb8ab85e25d7896.zip
Qt-e6dc532b7061df210f350e9f6cb8ab85e25d7896.tar.gz
Qt-e6dc532b7061df210f350e9f6cb8ab85e25d7896.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Unbreak compilation with ICC when in C++98 mode. Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset Fix QNetworkConfigurationManager crash due to null private pointer. Add Intel Compiler's C++0x feature support macros Remove the assignment-move operator that was a bad copy-paste
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions