summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-221-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-211-1/+1
| |\
| | * Revert "Report the error as being AlreadyExists if this is why it fails"Morten Johan Sørvig2010-04-212-7/+3
| | * fix typosOswald Buddenhagen2010-04-201-1/+1
| | * Report the error as being AlreadyExists if this is why it failsAndy Shaw2010-04-192-3/+7
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-222-43/+38
|\ \ \ | |/ / |/| |
| * | Optimize ~QObjectOlivier Goffart2010-04-211-15/+11
| * | Optimize QMetaObject::activateOlivier Goffart2010-04-202-28/+27
| |/
* | Fix crash on startup on Symbian OSShane Kearns2010-04-202-6/+17
|/
* Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-152-8/+8
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-142-41/+17
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-132-41/+17
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-122-41/+17
| | |\
| | | * Compile fix for WinCEThierry Bastian2010-04-121-1/+7
| | | * Remove obsolete function set_winapp_name()miniak2010-04-092-44/+14
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed app freeze if switching to offline in middle of HTTP transaction.Aleksandar Sasha Babic2010-04-121-1/+7
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-132-6/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-072-3/+6
| |\ \ \ | | | |/ | | |/|
| * | | Optimization: Improve allocation strategy for QDeclarativeDeclarativeDataAaron Kennedy2010-04-012-6/+7
* | | | 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
| | | |\ \ \ \ \ \