summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-0814-46/+76
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0819-301/+118
|\
| * Revert "Support QList<QObject*> properties"Aaron Kennedy2010-04-0816-297/+70
| * Document behavior of conflicting when clauses.Michael Brasser2010-04-083-4/+48
* | Don't emit clicked() after pressAndHold()Martin Jones2010-04-083-1/+45
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0817-75/+311
|\
| * Support QList<QObject*> propertiesAaron Kennedy2010-04-0816-70/+297
| * Update Repeater docs.Michael Brasser2010-04-071-5/+14
* | Fix setting of pointSize and pixelSize in different items.Martin Jones2010-04-085-6/+60
|/
* Build on Windows.Martin Jones2010-04-071-1/+6
* Visual test updates.Michael Brasser2010-04-0711-3/+36
* Make sure tests cleanup after themselves.Michael Brasser2010-04-073-3/+67
* Make sure Loader doesn't leak when component has errors.Michael Brasser2010-04-071-3/+3
* Cleanup (remove QDeclarativeScriptClass)Aaron Kennedy2010-04-0713-142/+34
* Disallow nested elements in ListModelAaron Kennedy2010-04-073-4/+14
* Fix warningMartin Jones2010-04-071-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0712-178/+159
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0735-278/+562
| |\
| | * Cleanup minehunt exampleYann Bodson2010-04-071-160/+114
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
| | |\ \ | |/ / /
| | * | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| | |\ \
| | | * | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | | | |\ \
| | | | | * | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | * | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-066-3/+31
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Doc: update the QDBusPendingCallWatcher example to show where to deleteThiago Macieira2010-04-061-0/+1
| | * | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
| | * | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-063-1/+21
| | |\ \ \ \ | |/ / / / /
| | * | | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| | * | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-062-1/+6
| | * | | | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-068-2/+490
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Disallow creation of attached objects Keys and KeyNavigationMartin Jones2010-04-073-35/+36
| |_|_|_|/ |/| | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0724-84/+259
|\ \ \ \ \
| * | | | | Allow iteration over the Item.children propertyAaron Kennedy2010-04-075-3/+90
| * | | | | Add QListModelInterface::modelReset() signal and emit this inBea Lam2010-04-076-46/+43
| * | | | | CompileAaron Kennedy2010-04-071-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-071-0/+5
| |\ \ \ \ \
| | * | | | | Expand test.Michael Brasser2010-04-071-0/+5
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-07417-5950/+12373
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Optimization: Only allocate QScriptValue if we need tooAaron Kennedy2010-04-013-10/+13
| * | | | | | Crash: Assign context in CreateSimpleObject tooAaron Kennedy2010-04-011-6/+6
| * | | | | | Optimization: Minor object allocation speedupAaron Kennedy2010-04-011-1/+7
| * | | | | | Optimization: Improve allocation strategy for QDeclarativeDeclarativeDataAaron Kennedy2010-04-0110-24/+101
* | | | | | | Keep track of the item count to avoid calling model->count() during batched c...Martin Jones2010-04-073-22/+55