summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add more detailed debuggingAaron Kennedy2010-01-202-2/+4
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-01-2018-60/+195
|\
| * Remove qHash(QUrl) duplicateMartin Jones2010-01-201-9/+2
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-2018-49/+186
| |\
| | * CompileAaron Kennedy2010-01-201-1/+1
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-20196-2307/+3333
| | |\
| | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-203-41/+31
| | | |\
| | | * | Compile with Qt 4.6.1Aaron Kennedy2010-01-2018-47/+186
| | * | | Remove debuggingAaron Kennedy2010-01-191-2/+0
| * | | | Add qHash(QUrl) for QmlPixmapCache.Martin Jones2010-01-201-0/+5
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-2049-264/+570
| |\ \ \
| * | | | Use Q_GLOBAL_STATIC for static global.Martin Jones2010-01-201-11/+11
* | | | | Keep empty lists and 1-item lists as lists instead of converting themBea Lam2010-01-202-21/+103
| |/ / / |/| | |
* | | | Revert previous change. Does not work for statically defined list models.Bea Lam2010-01-202-30/+20
| |_|/ |/| |
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-207-25/+55
|\ \ \ | |/ /
| * | Add support for aliases in test http server.Martin Jones2010-01-202-1/+19
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-201-1/+1
| |\ \
| | * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2010-01-19132-1970/+3070
| | |\ \
| | * | | Make QmlGraphicsAnchors a NOCREATE type.Michael Brasser2010-01-191-1/+1
| * | | | Avoid using QUrl::toString() in QmlPixmapCache.Martin Jones2010-01-202-21/+32
| | |/ / | |/| |
| * | | Remove unnecessary semicolonMartin Jones2010-01-191-1/+1
| * | | Fix examples/declarative/plugins exampleAlan Alpert2010-01-191-1/+2
* | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-2047-234/+550
|\ \ \ \ | |/ / / |/| | |
| * | | QMetaObject::disconnectOne()Aaron Kennedy2010-01-204-7/+102
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1932-192/+322
| |\ \ \
| | * | | Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | * | | Fix copyright year.Jason McDonald2010-01-1911-11/+11
| | * | | Bump version to 4.6.2.Jason McDonald2010-01-1918-24/+24
| | * | | Add skeleton changes file for 4.6.2.Jason McDonald2010-01-191-0/+159
| | * | | Add released version of 4.6.1 changes file for posterity.Jason McDonald2010-01-191-157/+104
| | * | | Designer crashes when previewing QMainWindow with native Toolbar on MacPrasanth Ullattil2010-01-191-0/+13
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-191-1/+2
| |\ \ \ \
| | * | | | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-194-16/+66
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-192-7/+46
| | |\ \ \ \
| | | * | | | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | * | | | Fix TypoThomas Zander2010-01-191-1/+1
| | * | | | | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| | |/ / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-193-3/+42
| |\ \ \ \ \
| | * | | | | QNativeSocketEngine windows: Fix performance degredation in write()Markus Goetz2010-01-191-2/+11
| | * | | | | Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-192-1/+31
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-193-21/+40
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | another attempt at fixing the translations buildOswald Buddenhagen2010-01-192-4/+12
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-192-18/+29
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-182-18/+29
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-162-18/+29
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-152-18/+29
| | | | |\ \ \ \ \
| | | | | * | | | | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-151-1/+1
| | | | | |\ \ \ \ \