summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into masterOlivier Goffart2011-03-155-21/+26
|\
| * Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| * Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-032-4/+5
| * Wrap qPrintable inside QStringOlivier Goffart2011-03-011-1/+1
| * Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-011-0/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-142-13/+17
|\ \
| * \ Merge branch 'master-upstream'Thierry Bastian2011-03-1043-131/+762
| |\ \
| * \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-1516-33/+105
| |\ \ \
| * \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-0816-75/+65
| |\ \ \ \
| * \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-20482-564/+1019
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2520-158/+382
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-243-9/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-222-9/+44
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1638-2819/+6021
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-153-10/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-112-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-052-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-303-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-272-107/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-2620-109/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Mention when the role was introducedAlbert Astals Cid2010-11-251-1/+2
| * | | | | | | | | | | | | | | | | Add a way to set QHeaderView initial sort orderAlbert Astals Cid2010-11-252-13/+16
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1128-98/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update copyright year to 2011.Rohan McGovern2011-03-1023-23/+23
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-082-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-082-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-071-62/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-071-62/+62
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-043-11/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-283-11/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-2430-97/+205
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
| | | * | | | | | | | | | | | | | | | | | | QNAM: Threaded HTTP implementationMarkus Goetz2011-02-212-9/+15
* | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-112-2/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-101-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.Liang Qi2011-03-101-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Get the number of cores from HAL on Symbian.Liang Qi2011-03-101-2/+25
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Bump Qt version to 4.7.3Timo Turunen2011-03-091-2/+2
| * | | | | | | | | | | | | | | | | | | | | | Fix for misplaced endif in qglobal.h.Laszlo Agocs2011-03-091-0/+1
| * | | | | | | | | | | | | | | | | | | | | | Multiple screen support for Symbian in QDeskopWidget.Laszlo Agocs2011-03-091-0/+2
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-042-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-042-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-042-1/+6
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-2817-11/+360
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix license headersHarald Fernengel2011-02-221-23/+28
| * | | | | | | | | | | | | | | | | | | | | Various INTEGRITY fixesRolland Dudemaine2011-02-2212-9/+62
| * | | | | | | | | | | | | | | | | | | | | Atomic operations support for INTEGRITY RTOSRolland Dudemaine2011-02-224-1/+292