Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alexis Menard | 2010-03-25 | 9 | -81/+315 |
|\ | |||||
| * | Fix error reporting when symbian file copy fails. | Shane Kearns | 2010-03-24 | 2 | -2/+42 |
| * | QIODevice::read() and QFile::atEnd() performance improvements | mread | 2010-03-24 | 4 | -78/+260 |
| * | Made it possible to define more than one language using pkg_prerules | Miikka Heikkinen | 2010-03-24 | 1 | -1/+0 |
| * | Reset history states when (re)starting state machine | Kent Hansen | 2010-03-22 | 2 | -0/+13 |
* | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-03-24 | 2 | -6/+6 |
|\ \ | |||||
| * | | Fix compilation for winCE | Thierry Bastian | 2010-03-24 | 1 | -1/+2 |
| * | | compile fix for mingw (also removes some warnings) | Thierry Bastian | 2010-03-23 | 2 | -7/+6 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Warwick Allison | 2010-03-23 | 2 | -37/+33 |
|\ \ \ | |/ / | |||||
| * | | Optimize QMetaObject::indexOf* functions | Olivier Goffart | 2010-03-23 | 1 | -31/+32 |
| * | | Fix warning on Sequential Animation Group | Thierry Bastian | 2010-03-23 | 1 | -6/+1 |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-22 | 2 | -1/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add MiddleButton = MidButton to MouseButtons enum. | Martin Jones | 2010-03-22 | 2 | -1/+3 |
* | | | Merge branch '4.6-s60' into 4.7-s60 | axis | 2010-03-22 | 11 | -24/+62 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-03-19 | 2 | -5/+12 |
| |\ | |||||
| | * | Change fromSymbianRSgImage() to use the newer version of RSgImage | Jason Barron | 2010-03-19 | 1 | -3/+6 |
| | * | Removed extra space from the command line passed to QProcess in Symbian | Miikka Heikkinen | 2010-03-19 | 1 | -2/+6 |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-03-19 | 7 | -16/+37 |
| |\ \ | | |/ | |/| | |||||
| | * | Implement Q_PRIVATE_PROPERTY that allows you to declare properties | Alexis Menard | 2010-03-19 | 1 | -0/+2 |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-03-18 | 6 | -16/+35 |
| | |\ | |||||
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-03-18 | 6 | -16/+35 |
| | | |\ | |||||
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-03-17 | 6 | -16/+35 |
| | | | |\ | |||||
| | | | | * | Fix a crash in animation groups when deleting uncontrolled animations | Thierry Bastian | 2010-03-17 | 6 | -16/+35 |
| * | | | | | Enable s60main.rsc infixing. | Miikka Heikkinen | 2010-03-19 | 2 | -21/+13 |
| |/ / / / | |||||
| * | | | | Useful support for -qtlibinfix configure parameter in Symbian | Miikka Heikkinen | 2010-03-18 | 1 | -0/+18 |
| |/ / / | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-19 | 7 | -11/+20 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-19 | 7 | -11/+20 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60 | axis | 2010-03-18 | 1 | -6/+10 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Handle Symbian's file name encoding, correctly. | Alessandro Portale | 2010-03-16 | 1 | -6/+10 |
| | | |/ / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 6 | -5/+10 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-03-17 | 6 | -5/+10 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60 | axis | 2010-03-16 | 2 | -4/+2 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-15 | 4 | -8/+18 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-11 | 42 | -2303/+3366 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-03-01 | 32 | -68/+868 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | | Corrected library locations for deployment on Symbian. | axis | 2010-02-25 | 1 | -1/+1 |
| | | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-23 | 25 | -165/+518 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 8 | -23/+59 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-18 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 57 | -703/+1023 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 6 | -18/+43 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | axis | 2010-02-12 | 28 | -84/+162 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-26 | 2 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-01-21 | 459 | -985/+1222 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2009-12-18 | 89 | -1016/+2193 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'possible_qmake_scope_fixes' | axis | 2009-12-11 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | | Fixed qmake scope specification. | axis | 2009-10-23 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-11-06 | 55 | -972/+2084 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | Added std headers to fix Symbian build error. | axis | 2009-10-23 | 1 | -0/+5 |
| | | | * | | | | | | | | | | | | | | | | | Fixed incorrect header includes. | axis | 2009-10-23 | 2 | -2/+2 |