summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-20114-908/+1249
|\
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-202-36/+31
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2010-01-2021-71/+171
| | |\
| | | * Revert previous change. Does not work for statically defined list models.Bea Lam2010-01-201-25/+20
| | * | Use Q_GLOBAL_STATIC for static global.Martin Jones2010-01-201-11/+11
| * | | Compile with Qt 4.6.1Aaron Kennedy2010-01-2017-47/+176
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2010-01-204-23/+34
| |\ \ | | |/
| | * 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-1978-762/+1411
| | | |\
| | | * | 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
| * | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-2020-46/+151
| |\ \ \ | | |/ / | |/| |
| | * | QMetaObject::disconnectOne()Aaron Kennedy2010-01-203-7/+29
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1911-10/+34
| | |\ \
| | | * | Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | | * | Fix copyright year.Jason McDonald2010-01-196-6/+6
| | | * | Bump version to 4.6.2.Jason McDonald2010-01-193-4/+4
| | | * | 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/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-193-15/+65
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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-191-6/+45
| | | |\ \
| | | | * | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | * | | 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-192-3/+19
| | |\ \ \
| | | * | | QNativeSocketEngine windows: Fix performance degredation in write()Markus Goetz2010-01-191-2/+11
| | | * | | Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-191-1/+8
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-191-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-181-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-161-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-17/+28
| | | | | |\ \ \
| | | | | | * | | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| * | | | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-1976-761/+862
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Enhance QFileNetworkReplyMarkus Goetz2010-01-184-65/+48
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-183-56/+64
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix QSslCertificate issuesMarkus Goetz2010-01-181-2/+12
| | | * | | | | | QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| | | * | | | | | If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| | | * | | | | | QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
| | | * | | | | | don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-1/+2
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-189-13/+13
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| | | * | | | | | Remove qmake warning by using appropriate variable.axis2010-01-181-1/+1
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-181-0/+10
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Fixes: When calling QDesktopWidget::screenGeometry() with a nullAndy Shaw2010-01-181-0/+10
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix compilation on IA-64 with the Intel compiler: cast properly.Thiago Macieira2010-01-161-1/+1
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |