summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-268-33/+33
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-268-33/+33
| |\
| | * Run util/normalize on src/declarative.Yann Bodson2010-10-268-33/+33
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-253-8/+5
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-253-8/+5
| |\ \ | | |/ | |/|
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-221-13/+14
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-213-13/+30
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2040-189/+224
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2016-183/+472
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-0/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1429-541/+844
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0818-49/+176
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-6/+2
| | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-072-2/+3
* | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-253-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-253-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2557-398/+744
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix Flipable docsBea Lam2010-10-221-13/+14
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-211-2/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-211-2/+3
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| |/ / / / / /
| * | | | | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| * | | | | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-201-30/+4
| * | | | | | Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-201-6/+9
| * | | | | | Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1931-88/+127
| * | | | | | Call the correct vme meta object when connecting alias signalsAaron Kennedy2010-10-191-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-195-43/+56
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | * | | | | ListView.visibleArea.heightRatio should not emit a signal when it does not ch...Yann Bodson2010-10-183-13/+26
| | * | | | | Properties should have precedence over methods.Michael Brasser2010-10-181-29/+29
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-1815-181/+470
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-152-30/+34
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-142-30/+34
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-132-30/+34
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0718-49/+176
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | * | | | | | | | Allow overloaded methods, and methods with default params, to be called in QMLAaron Kennedy2010-10-153-21/+317
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-10-151-3/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| | | * | | | | | | | Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| | * | | | | | | | | Fix potential memory corruption in QDeclarativePropertyCacheAaron Kennedy2010-10-141-4/+7
| | |/ / / / / / / /
| | * | | | | | | | Correctly splice properties from derived metaobjects togetherAaron Kennedy2010-10-142-58/+28
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-1413-547/+577
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Optimization: Don't generate intermediate QDeclarativeComponent'sAaron Kennedy2010-10-148-64/+48
| | | |/ / / / / / /
| | * | | | | | | | Fix consistency of setting currentIndex in ListView and GridView.Martin Jones2010-10-142-34/+68
| * | | | | | | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-181-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-141-0/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1329-541/+844
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0718-49/+176
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0516-306/+493
| |\ \ \ \ \