summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into masterOlivier Goffart2011-03-153-20/+24
|\
| * Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| * Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-032-4/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-041-2/+2
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-247-20/+36
| |\
| * | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
* | | Various INTEGRITY fixesRolland Dudemaine2011-02-221-0/+1
| |/ |/|
* | Remove the assignment-move operator that was a bad copy-pasteThiago Macieira2011-02-211-2/+0
* | Fix the move semantics in QSharedDataPointer and QExplicitSDPThiago Macieira2011-02-211-1/+5
* | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-163-3/+169
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3199-101/+103
| |\
| * | Fix GCC compiler warningShane Kearns2011-01-271-1/+1
| * | Add QScopedValueRollback tools class.Shane Kearns2011-01-263-3/+169
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-105-19/+23
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-082-3/+2
| |\ \ \
| | * | | Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORSDavid Faure2011-02-081-1/+1
| | * | | Doc: Fix the docs saying what the locale codec is used forThiago Macieira2011-02-061-2/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-314-16/+21
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Doc: Fixed inconsistent and incorrect terminology.David Boddie2011-01-181-1/+1
| | * | | Doc: Clarified the use of qUncompress().David Boddie2011-01-171-5/+5
| | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1399-99/+99
| | |\ \ \
| | * \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-7/+7
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-141-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-079-19/+39
| | |\ \ \ \ \ \
| | * | | | | | | doc: Removed illegal \section1.Martin Smith2010-10-251-2/+1
| | * | | | | | | doc: Changed a \section in a \table into a \header.Martin Smith2010-10-251-1/+3
| | * | | | | | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-152-3/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-131-0/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-094-10/+6
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.7' into mimirMorten Engvoldsen2010-10-067-31/+31
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-10-041-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' into mimirMorten Engvoldsen2010-09-236-104/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMorten Engvoldsen2010-09-201-8/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | qdoc: DITA XML generator now uses <section> elements...Martin Smith2010-09-181-8/+12
* | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make syncqt not complain about missing header macros.Thiago Macieira2011-01-271-0/+10
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1799-99/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-1099-99/+99
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | deal with utcOffset in a correct wayRitt Konstantin2011-01-111-2/+4
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-242-9/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-12-242-9/+92
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added int overloads to QPoint operator* and operator*=.Samuel Rødal2010-12-222-9/+92
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-246-18/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add QElapsedTimer::nsecsElapsed() constBradley T. Hughes2010-12-206-18/+58
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-081-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-232-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Doc: Removed incorrect statement about the C locale.David Boddie2010-11-221-2/+0