summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-0711-22/+83
|\
| * Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-031-0/+14
| |\
| | * [plugins] Don't conclude that a .debug file is a plugin.Thiago Macieira2010-04-031-0/+14
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-1/+1
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-011-1/+1
| | |\
| | | * Fix regression on SymbianShane Kearns2010-03-311-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-015-5/+60
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0112-232/+136
| | |\ \ \ | | | |/ /
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30127-5489/+11463
| | |\ \ \
| | | * | | Fix QDate::isLeapYear() for years < 1John Layt2010-03-301-1/+4
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-304-4/+56
| | | |\ \ \
| | | | * | | QVarLenghtArray: add some API to be consistant to QVectorOlivier Goffart2010-03-292-1/+50
| | | | * | | QMetaObject::normalizeType: Fix parsing of type which contains "const" in namesOlivier Goffart2010-03-261-1/+2
| | | | * | | QMetaObject::normalizeType: fix uses of const and template.Olivier Goffart2010-03-261-1/+3
| | | | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2539-2192/+5838
| | | | |\ \ \
| | | | * | | | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| * | | | | | | Revert "adds a timeout option to QThreadPool::waitForDone();"Pierre Rossi2010-04-013-15/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Optimization: Improve allocation strategy for QDeclarativeDeclarativeDataAaron Kennedy2010-04-012-6/+7
|/ / / / / /
* | | | | | Fix compilation on Windows: forgot to change one toTime_tHelperThiago Macieira2010-03-311-1/+1
* | | | | | adds a timeout option to QThreadPool::waitForDone();Pierre Rossi2010-03-313-7/+15
* | | | | | Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.Thiago Macieira2010-03-313-22/+22
* | | | | | Add QDateTime members that operate on 64-bit milliseconds.Thiago Macieira2010-03-312-15/+105
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-306-202/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.Thiago Macieira2010-03-301-3/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-306-202/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix compile error on mingw.Jason McDonald2010-03-301-1/+4
| | * | | | Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't definedThiago Macieira2010-03-291-1/+1
| | * | | | Ensure that we return QPair<long,long> in all cases.Thiago Macieira2010-03-291-3/+3
| | * | | | Remove QGuard.Thiago Macieira2010-03-264-197/+1
| | | |_|/ | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-2539-2192/+5838
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-259-81/+315
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2911-83/+334
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Correct documentation for ObjectReplacementCharacter and ReplacementCh.Frans Englich2010-03-251-2/+6
| * | | Symbian event loop priority drop not used in Symbian^4mread2010-03-251-0/+13
| | |/ | |/|
| * | Fix error reporting when symbian file copy fails.Shane Kearns2010-03-242-2/+42
| * | QIODevice::read() and QFile::atEnd() performance improvementsmread2010-03-244-78/+260
| * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+0
| * | Reset history states when (re)starting state machineKent Hansen2010-03-222-0/+13
* | | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-1/+3
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-242-6/+6
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-37/+33
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-1/+3
| |\ \ \ \
| | * | | | Add MiddleButton = MidButton to MouseButtons enum.Martin Jones2010-03-222-1/+3
* | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-242-6/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix compilation for winCEThierry Bastian2010-03-241-1/+2
| * | | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-232-7/+6
| | |_|/ / | |/| | |
* | | | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-241-1/+1
* | | | | Add a check to make sure QTranslator doesn't load a directory.David Sansome2010-03-241-2/+2
* | | | | Revert "Optimized QLocale to access system locale on demand."Morten Johan Sørvig2010-03-243-179/+54