summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-234250-72487/+73162
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-2010-20/+22
| |\
| | * Fixed compilation.Rohan McGovern2011-05-201-1/+1
| | * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-20425-8638/+8502
| | |\
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-193-51/+51
| | |\ \
| | | * | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
| | * | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-183838-65189/+65191
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-173840-65204/+65206
| | | |\ \
| | | | * | Fix a regression in QList::mid()Liang Qi2011-05-161-0/+2
| | | | * | Update licenseheader text in source filesJyri Tahtela2011-05-133840-65204/+65204
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-161-2/+2
| | | |\ \ \
| | | | * | | Fixed bug in meego graphics system runtime switching.Samuel Rødal2011-05-161-2/+2
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-168-18/+18
| | | |\ \ \ \
| | | | * | | | Fix memory leak in QXmlQuery::setQuery.Niklas Kurkisuo2011-05-138-18/+18
| | * | | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-1859-4646/+342
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-201-3/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | QLibrary: support .so file extension on AIX.Pierre Rossi2011-05-191-3/+3
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-05-205-1627/+1321
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-05-204250-72168/+72295
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-199-62/+105
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-181-17/+17
| | * | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1894-4516/+724
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-164-1/+48
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-134254-72269/+72269
| | * | | | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-13122-130/+8579
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1130-217/+879
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-06148-1769/+1678
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-teamEckhart Koppen2011-04-293-7/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-04-293-7/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Updated DEF files for QtGui and QtOpenGlEckhart Koppen2011-04-294-0/+151
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Updated DEF files for QtGui and QtOpenGLEckhart Koppen2011-04-294-54/+54
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Fixed compile of qdrawhelper_neon.cpp.Samuel Rødal2011-05-191-1/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Fix rendering of Mac controls onto a QImageAndy Shaw2011-05-191-1/+1
| * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-197-61/+96
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-1895-4629/+724
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Symbian socket: Implement systemProxyForQuery for service networksShane Kearns2011-05-181-37/+52
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-16126-133/+8643
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-1148-274/+1080
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | QT_USE_QSTRINGBUILDER to fix source compatibilityOlivier Goffart2011-05-095-21/+16
| | * | | | | | | | | | | | | | | | | Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.Martin Petersson2011-05-061-3/+28
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-05-192-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII...Simon Hausmann2011-05-161-1/+3
| | * | | | | | | | | | | | | | | | | Fix crashes with regular expressions QtScript on ARM traditional architecturesSimon Hausmann2011-05-161-0/+6
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-1843-93/+492
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-16126-133/+8643
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-154-38/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-144-38/+48
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \