summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-14/+25
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-101-14/+25
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-051-14/+25
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-14/+25
| | | |\
| | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-021-1/+20
| | | | |\
| | | | * \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-271-0/+1
| | | | |\ \
| | | | * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-146-20/+49
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-171-0/+6
| | | | |\ \ \ \
| | | | * | | | | Signature is:Warwick Allison2009-11-131-7/+7
| | | | * | | | | fix -quietWarwick Allison2009-11-131-0/+9
| | | | * | | | | Quietness option.Warwick Allison2009-11-131-7/+9
| | | | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-191-0/+10
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-294-8/+14
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-155-20/+20
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-083-35/+219
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-033-9/+106
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-312-7/+26
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-312-104/+170
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-252-0/+213
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-131-1/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-241-24/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-191-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-272-361/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-04-221-46/+76
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Fixes for solution package.Jan-Arve Sæther2009-04-221-46/+76
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-221-9/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | update the package script according to class renamingKent Hansen2009-04-211-4/+4
| | | | | * | | | | | | | | | | | | | | | | remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-201-0/+1
| | | | | * | | | | | | | | | | | | | | | | cleanup in demoThierry Bastian2009-04-201-1/+0
| | | | | * | | | | | | | | | | | | | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-175-0/+1684
| | | | | / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+337
| | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | Long live Qt!Lars Knoll2009-03-234-0/+1353
| | | | / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-38/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-38/+52
* | | | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Streamlined smart installer package creation in SymbianMiikka Heikkinen2010-02-091-5/+11
* | | | | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-093-23/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Don't remove all dependencies when patching the pkg.Miikka Heikkinen2010-02-081-3/+7
| * | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-02-051-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Make sure include for QAudio namespace is createdJustin McPherson2010-02-051-0/+2
| * | | | | | | | | | | | | | | | | | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-041-20/+44
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-01-281-1/+24
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-012-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Added support for embedded sis name/uid patching for SymbianMiikka Heikkinen2010-01-271-1/+20
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add a convenience batch file to run the patch capabilities perl scriptMarius Storm-Olsen2010-01-261-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mas...Pulse Build System2010-01-222-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'merge-request-1601' into master-s60axis2010-01-052-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add createpackage.bat equivalent for Unix systems.Anderson Lizardo2009-10-271-0/+3
| | * | | | | | | | | | | | | | Fix portability problems in bin/createpackage.pl.Anderson Lizardo2009-10-231-8/+6