summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary QDeclarativeProperty::Type enum valuesAaron Kennedy2010-02-263-22/+43
* Fix qdatastream::compatibility_Qt3 autotest failureLeonardo Sobral Cunha2010-02-261-2/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-266-7/+486
|\
| * Add ParentAnimation.Michael Brasser2010-02-266-7/+486
* | Make compile following recent QDeclarativeProperty changesBea Lam2010-02-261-28/+28
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-25150-2175/+2768
|\ \ | |/
| * Update test numbers after change to default transformOrigin.Michael Brasser2010-02-251-6/+4
| * Protect against double initialization.Roberto Raggi2010-02-252-6/+20
| * Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-251-0/+1
| * Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
| * Fix compilation: intptr_t -> quintptrThiago Macieira2010-02-251-2/+2
| * Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-252203-140276/+143703
| |\
| | * Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| | * Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-2514-35/+45
| | * Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-2553-520/+519
| | * Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-1000/+1072
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlJustin McPherson2010-02-254-12/+81
| | |\
| | | * Document and test resetting properties in a state change.Michael Brasser2010-02-253-1/+69
| | | * Handle smooth reparenting where the item being reparented has a complexMichael Brasser2010-02-251-11/+12
| | * | Fix up some rename confusion.Justin McPherson2010-02-254-135/+3
| | |/
| | * Make more private QDeclarativeMetaProperty methods privateAaron Kennedy2010-02-2516-89/+95
| | * docWarwick Allison2010-02-251-3/+1
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-2572-483/+1015
| |\ \
| | * | Better check in QStaticText testcase if xformed text is supportedGunnar Sletta2010-02-251-5/+12
| | * | Fix point drawing in QPainter.Gunnar Sletta2010-02-251-1/+1
| | * | Merge remote branch 'origin/master'Olivier Goffart2010-02-2433-57/+175
| | |\ \ | | |/ / | |/| |
| | * | Expand indicator would not be displayed after removal of a collapsed item's c...Gabriel de Dietrich2010-02-242-4/+23
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-243-27/+28
| | |\ \
| | | * | Doc: fix formattingaavit2010-02-241-22/+22
| | | * | Make the qpainter test compile under Windows.Trond Kjernaasen2010-02-241-2/+3
| | | * | make QtScript compatible with mingw 64Thierry Bastian2010-02-241-3/+3
| | * | | Avoid always detaching QStaticTextEskil Abrahamsen Blomfeldt2010-02-241-2/+0
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-243587-289712/+160111
| | |\ \
| | | * | Add licence headerOlivier Goffart2010-02-241-0/+41
| | | * | Fixed a warning.Trond Kjernåsen2010-02-241-1/+1
| | | * | WinCE compilation fixaavit2010-02-241-1/+1
| | | * | Fixed hypersensitive drag on QHeaderViewsGabriel de Dietrich2010-02-241-7/+2
| | | * | Fix seg-fault when no X11 desktop environment is presentTom Cooksey2010-02-241-23/+53
| | | * | Remove comment in drawStaticTextItem() in GL engineEskil Abrahamsen Blomfeldt2010-02-241-1/+0
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-24149-324/+23645
| | | |\ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Rhys Weatherley2010-02-233350-284439/+131445
| | | |\ \ \
| | | | * | | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-233350-284441/+131453
| | | | * | | Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ...Jocelyn Turcotte2010-02-234-21/+15
| | | * | | | Separate Phonon and gstreamer defines in qtconfigRhys Weatherley2010-02-232-2/+9
| | | |/ / /
| | | * | | Fix compilation on WindowsOlivier Goffart2010-02-231-1/+1
| | | * | | Compile with QT_USE_FAST_OPERATOR_PLUSOlivier Goffart2010-02-231-2/+2
| | | * | | Fix compilation error in openVGOlivier Goffart2010-02-231-1/+1
| | * | | | Fix QStaticText test on QWSEskil Abrahamsen Blomfeldt2010-02-241-1/+29
| | |/ / /
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-233468-132850/+286264
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233387-131064/+284396
| | | |\ \ \