summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-24 09:56:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-24 09:56:09 (GMT)
commitf6310e6148180d651e95bff482ded47272e38718 (patch)
tree3f89e82669b12ea49e0586d3ff14c0d01594301e /qmake
parent164728f711136356a6c3482f762321b01c9d82dd (diff)
parent11cc0f661911628fb51c92d30c684eb1cea01145 (diff)
downloadQt-f6310e6148180d651e95bff482ded47272e38718.zip
Qt-f6310e6148180d651e95bff482ded47272e38718.tar.gz
Qt-f6310e6148180d651e95bff482ded47272e38718.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: my changelog for 4.8.0 QAuthenticator::setUser() parse user name in form user@domain tst_qnetworkreply: add a test for http abort. Fix a case of SP_MediaSkipForward returning the wrong pixmap. fix an incorrect OpenMode flags handling in QBuffer::open() move some internal helper functions from qglobal.cpp to qcore_mac* make the previous change foolproof get rid of extra copying (another one) get rid of extra copying add a benchmark for QCFString Fix errors in qsocketnotifier test
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions