Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -14/+25 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 1 | -14/+25 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 1 | -14/+25 |
| | |\ | |||||
| | | * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 1 | -14/+25 |
| | | |\ | |||||
| | | | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 1 | -1/+20 |
| | | | |\ | |||||
| | | | * \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 1 | -0/+1 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 6 | -20/+49 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 1 | -0/+6 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Signature is: | Warwick Allison | 2009-11-13 | 1 | -7/+7 |
| | | | * | | | | | fix -quiet | Warwick Allison | 2009-11-13 | 1 | -0/+9 |
| | | | * | | | | | Quietness option. | Warwick Allison | 2009-11-13 | 1 | -7/+9 |
| | | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 1 | -0/+10 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 4 | -8/+14 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 5 | -20/+20 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Martin Jones | 2009-09-08 | 3 | -35/+219 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-09-03 | 3 | -9/+106 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-31 | 2 | -7/+26 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-31 | 2 | -104/+170 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-25 | 2 | -0/+213 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-08-13 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-06-24 | 1 | -24/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Aaron Kennedy | 2009-06-19 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-05-27 | 2 | -361/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in... | Michael Brasser | 2009-04-22 | 1 | -46/+76 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | | | Fixes for solution package. | Jan-Arve Sæther | 2009-04-22 | 1 | -46/+76 |
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 1 | -9/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | | | | | | | update the package script according to class renaming | Kent Hansen | 2009-04-21 | 1 | -4/+4 |
| | | | | * | | | | | | | | | | | | | | | | | remove QItemAnimation and add the interpolator for QColor | Thierry Bastian | 2009-04-20 | 1 | -0/+1 |
| | | | | * | | | | | | | | | | | | | | | | | cleanup in demo | Thierry Bastian | 2009-04-20 | 1 | -1/+0 |
| | | | | * | | | | | | | | | | | | | | | | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 5 | -0/+1684 |
| | | | | / / / / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | | | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 2 | -0/+337 |
| | | | |/ / / / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | | Long live Qt! | Lars Knoll | 2009-03-23 | 4 | -0/+1353 |
| | | | / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 1 | -38/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Add make stub_sis target, and add webkit stub to qt.iby | Shane Kearns | 2010-02-12 | 1 | -38/+52 |
* | | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Streamlined smart installer package creation in Symbian | Miikka Heikkinen | 2010-02-09 | 1 | -5/+11 |
* | | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 3 | -23/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Don't remove all dependencies when patching the pkg. | Miikka Heikkinen | 2010-02-08 | 1 | -3/+7 |
| * | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i... | Qt Continuous Integration System | 2010-02-05 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Make sure include for QAudio namespace is created | Justin McPherson | 2010-02-05 | 1 | -0/+2 |
| * | | | | | | | | | | | | | | | | | | Added support for smart installer package generation in Symbian | Miikka Heikkinen | 2010-02-04 | 1 | -20/+44 |
| |/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 1 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added support for ifdeffing for manufacturer in generated pkg files | Miikka Heikkinen | 2010-01-28 | 1 | -1/+24 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Added support for embedded sis name/uid patching for Symbian | Miikka Heikkinen | 2010-01-27 | 1 | -1/+20 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Add a convenience batch file to run the patch capabilities perl script | Marius Storm-Olsen | 2010-01-26 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas... | Pulse Build System | 2010-01-22 | 2 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'merge-request-1601' into master-s60 | axis | 2010-01-05 | 2 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Add createpackage.bat equivalent for Unix systems. | Anderson Lizardo | 2009-10-27 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | | Fix portability problems in bin/createpackage.pl. | Anderson Lizardo | 2009-10-23 | 1 | -8/+6 |