summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-073-5/+4
|\
| * Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-073-5/+4
| |\
| | * make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-042-0/+4
| | * remove dead fileOswald Buddenhagen2009-12-041-5/+0
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-12-0726-59/+343
|\ \ \
| * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-12-0720-42/+191
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-0720-42/+191
| | |\ \ \ | | | |/ /
| | | * | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of oslo-staging-1/4.6...Simon Hausmann2009-12-0510-26/+168
| | | |\ \
| | | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-047-11/+11
| | | | |\ \
| | | | * | | doc: Example page now lists images used by the exampleMartin Smith2009-12-0410-26/+168
| | | * | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+2
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-031-2/+2
| | | | |\ \ \
| | | | | * | | Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| | | * | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-039-14/+19
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-027-11/+11
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | / | | | | | |_|/ | | | | |/| |
| | | | | * | Bump version to 4.6.1Jason McDonald2009-12-017-11/+11
| | | | * | | Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-298-33/+77
| | | | |\ \ \ | | | | | |/ /
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-0/+7
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | * | | Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| | | * | | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | | | |_|/ | | | |/| |
| * | | | | Move loader functionality into qmlviewer.Martin Jones2009-12-075-31/+115
| * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-12-0711-8/+782
| |\ \ \ \ \ | | |/ / / /
| * | | | | Bring up network on Symbian.Martin Jones2009-12-072-0/+51
* | | | | | Fix leaks.Michael Brasser2009-12-071-3/+1
| |/ / / / |/| | | |
* | | | | Add QML based file browser to qmlviewer.Martin Jones2009-12-0611-8/+782
|/ / / /
* | | | Compile as module.Warwick Allison2009-12-022-0/+3
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-12-015-3/+316
|\ \ \ \
| * | | | Build correct QmlViewer Screen orientation implementation for Maemo.Martin Jones2009-12-011-1/+1
| * | | | Cleanup orientation stuff.Martin Jones2009-12-011-14/+2
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-12-018-33/+77
| |\ \ \ \
| * | | | | Add Screen element in QmlViewr Module including orientation property.Martin Jones2009-12-015-3/+328
* | | | | | Compile when in module.Warwick Allison2009-12-011-0/+1
| |/ / / / |/| | | |
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-308-33/+77
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
| * | | ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
| * | | offer only possible countries for each languageOswald Buddenhagen2009-11-252-8/+27
| * | | make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
| * | | the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
| * | | don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
| * | | qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
| * | | fix class/struct mismatch in the bootstrap magicOswald Buddenhagen2009-11-251-2/+4
| * | | Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
| | |/ | |/|
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-301-0/+1
|\ \ \
| * | | Qt.quit() added to qml.Tapani Mikola2009-11-301-0/+1
* | | | Add orientation property to qmlviewer.Martin Jones2009-11-302-3/+48
|/ / /
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-2770-755/+843
|\ \ \ | |/ /
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-251-0/+36
| |\ \ | | |/
| | * updates french phrasebookPierre Rossi2009-11-231-0/+36
| * | Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-0/+7
| |/