summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-0/+22
|\
| * Symbian emulator: unload file server so apps can be recompiled.Frans Englich2010-04-081-0/+22
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-014-197/+1
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-304-197/+1
| |\ \
| | * | Remove QGuard.Thiago Macieira2010-03-264-197/+1
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-0/+13
| |\ \ \ | | |/ / | |/| / | | |/
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-3022-297/+589
|\ \ \ | |_|/ |/| |
| * | 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-255-74/+12
| |\ \ | | |/
| | * Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-241-5/+5
| | |\
| | * | Add a check to make sure QTranslator doesn't load a directory.David Sansome2010-03-241-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-234-72/+10
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-224-72/+10
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-194-72/+10
| | | | |\ \
| | | | | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-192-12/+8
| | | | | |\ \
| | | | | * | | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-174-8/+8
| | | | | * | | Port QtCore uses of QTime as a stopwatch to QTimestamp.Thiago Macieira2010-03-171-2/+2
| | | | | * | | Make qcore_unix.cpp share code with QTimestampThiago Macieira2010-03-173-70/+8
| * | | | | | | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-231-5/+5
| |/ / / / /
| * | | | | Optimize QMetaObject::indexOf* functionsOlivier Goffart2010-03-231-31/+32
| |/ / / /
| * | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-3/+15
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-191-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-191-1/+1
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-152-7/+7
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-119-125/+282
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-015-14/+101
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-2/+13
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-1610-64/+178
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-125-7/+19
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-2186-360/+385
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-1815-132/+297
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-066-253/+713
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix compilation.Simon Hausmann2009-10-231-1/+1
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-191-11/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | fix a crash when registering 2 metatype name for the same actual typeThierry Bastian2010-03-181-11/+7
| | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-112-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-103-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-092-0/+3
| * | | | | | | | | | | | make it possible to use sse2 with mingwThierry Bastian2010-03-112-7/+7
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Improve performance of QTimer::singleShotMarkus Goetz2010-03-091-1/+13
| * | | | | | | | | | | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-071-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | QMetaType::type(): return immediately if the typename is emptyKent Hansen2010-03-051-0/+2
| * | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-064-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-042-1/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | be more verbose when warning about incompatible librariesHarald Fernengel2010-03-031-1/+2
| | * | | | | | | | | | | Add a template specialisation for QArgument when T is a reference.Thiago Macieira2010-03-021-0/+8
| * | | | | | | | | | | | Fix source compatibility of qRegisterMetaTypeOlivier Goffart2010-03-031-14/+1