summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-37/+33
|\
| * Optimize QMetaObject::indexOf* functionsOlivier Goffart2010-03-231-31/+32
| * Fix warning on Sequential Animation GroupThierry Bastian2010-03-231-6/+1
* | 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 branch '4.6-s60' into 4.7-s60axis2010-03-2211-24/+62
|\ \ | |/ |/|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-192-5/+12
| |\
| | * Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-3/+6
| | * Removed extra space from the command line passed to QProcess in SymbianMiikka Heikkinen2010-03-191-2/+6
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-197-16/+37
| |\ \ | | |/ | |/|
| | * Implement Q_PRIVATE_PROPERTY that allows you to declare propertiesAlexis Menard2010-03-191-0/+2
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-186-16/+35
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-186-16/+35
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-176-16/+35
| | | | |\
| | | | | * Fix a crash in animation groups when deleting uncontrolled animationsThierry Bastian2010-03-176-16/+35
| * | | | | Enable s60main.rsc infixing.Miikka Heikkinen2010-03-192-21/+13
| |/ / / /
| * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-0/+18
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-197-11/+20
|\ \ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-197-11/+20
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-6/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Handle Symbian's file name encoding, correctly.Alessandro Portale2010-03-161-6/+10
| | | |/ /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-176-5/+10
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-176-5/+10
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-162-4/+2
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-154-8/+18
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1142-2303/+3366
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0132-68/+868
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Corrected library locations for deployment on Symbian.axis2010-02-251-1/+1
| | | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2325-165/+518
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-198-23/+59
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-181-1/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-1657-703/+1023
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-166-18/+43
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-1228-84/+162
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-262-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-21459-985/+1222
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-12-1889-1016/+2193
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'possible_qmake_scope_fixes'axis2009-12-111-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Fixed qmake scope specification.axis2009-10-231-1/+1
| | | | * | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-11-0655-972/+2084
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Added std headers to fix Symbian build error.axis2009-10-231-0/+5
| | | | * | | | | | | | | | | | | | | | | Fixed incorrect header includes.axis2009-10-232-2/+2
| | | | * | | | | | | | | | | | | | | | | 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-183-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-1713-262/+151
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-153-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix importing qml modules from rcc resourcesmae2010-03-111-2/+6
| | * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-112-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | |
generated by cgit v0.12 at 2024-11-15 01:56:59 (GMT)