Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | * | | | | | | | | | | | | | | | | Fix compilation. | Simon Hausmann | 2009-10-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Martin Jones | 2010-03-19 | 1 | -11/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | fix a crash when registering 2 metatype name for the same actual type | Thierry Bastian | 2010-03-18 | 1 | -11/+7 |
| |/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-18 | 3 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-03-17 | 13 | -262/+151 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-15 | 3 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix importing qml modules from rcc resources | mae | 2010-03-11 | 1 | -2/+6 |
| | * | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-11 | 2 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.7' into qml-4.7 | Qt Continuous Integration System | 2010-03-10 | 14 | -2080/+2203 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-03-10 | 2 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | Integrate QML's object ownership with the JS collector | Aaron Kennedy | 2010-03-09 | 2 | -0/+3 |
* | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-17 | 3 | -38/+571 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Implement symbian^3 e32atomics API | Shane Kearns | 2010-03-15 | 3 | -38/+571 |
* | | | | | | | | | | | | | | | | | | | QNetworkReply: Fix canReadLine() | Markus Goetz | 2010-03-16 | 1 | -0/+7 |
* | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-15 | 12 | -262/+144 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | different approach to fixing "the other" aliasing issue | Oswald Buddenhagen | 2010-03-15 | 1 | -37/+15 |
| * | | | | | | | | | | | | | | | | | | fix aliasing issue in node_construct() | Oswald Buddenhagen | 2010-03-15 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | | detach in fewer cases, remove redundant calculation | Oswald Buddenhagen | 2010-03-15 | 1 | -3/+1 |
| * | | | | | | | | | | | | | | | | | | Compile on ARM with -Werror -Wold-style-cast | Bradley T. Hughes | 2010-03-15 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | Doc fix in QLocale | Denis Dzyubenko | 2010-03-15 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | Fix QDir::entryList regression | João Abecasis | 2010-03-12 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | | remove qt_winQString2MB() and qt_winMB2QString() | Oswald Buddenhagen | 2010-03-11 | 3 | -102/+34 |
| * | | | | | | | | | | | | | | | | | | Fix qmake crash on Windows | João Abecasis | 2010-03-11 | 1 | -5/+1 |
| * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-11 | 6 | -116/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | doc: Fixed three new qdoc errors. | Martin Smith | 2010-03-11 | 3 | -6/+4 |