summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-03-2544-89/+171
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-246-1/+12
| |\
| | * 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
| | |\
| | * | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+4
| | * | corelib/tools: Add two ### Qt 5 commentshjk2011-03-162-0/+6
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-221-2/+2
| | |\ \
| | | * | Bump Qt version to 4.7.4Timo Turunen2011-03-211-2/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-211-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.Miikka Heikkinen2011-03-211-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-152-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-142-2/+2
| | | |\ \
| | | | * | Support to build Qt for Symbian on Mac OS X with gcce compiler.axis2011-02-211-1/+1
| | | | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-181-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1735-135/+188
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | 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 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