summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Fix warning about "data" being unused.Thiago Macieira2011-03-221-0/+1
* Fix declaration: it's QT_DECL_ALIGN, not QT_DECL_ALIGNEDThiago Macieira2011-03-221-1/+1
* Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-03-2216-28/+64
|\
| * Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1735-135/+188
| |\
| * | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-166-9/+10
| * | Rename qconfig-minimal-system-depenencies.hMorten Sorvig2011-03-161-0/+0
| * | Add QT_NO_FILESYSTEMITERATOR.Morten Johan Sørvig2011-03-165-0/+30
| * | Add QT_NO_DYNAMIC_LIBRARY.Morten Johan Sørvig2011-03-161-7/+11
| * | Compile.Morten Johan Sørvig2011-03-161-0/+2
| * | Fix CoreServices framework addition for qpa.Morten Johan Sørvig2011-03-161-7/+6
| * | Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-102-2/+2
| * | Build QProcess on platforms that don't have _NSGetEnvironcon2011-03-101-2/+2
| * | Inconsistency between ini case sensitivity between OS_MAC and WS_QPA.con2011-03-041-1/+1
* | | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+4
* | | corelib/tools: Add two ### Qt 5 commentshjk2011-03-162-0/+6
| |/ |/|
* | 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