summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13324-5530/+5530
* Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1027-103/+285
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-051-0/+2
| |\
| | * Fix compilation with QT_NO_*Tasuku Suzuki2011-05-021-0/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-045-2/+133
| |\ \ | | |/ | |/|
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-291-0/+5
| |\ \
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-281-0/+5
| | |\ \
| | | * | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-2726-193/+219
| | | |\ \
| * | | \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-2821-96/+263
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-275-8/+32
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-275-8/+32
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-4/+13
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | / / | | | | | |/ / | | | | |/| |
| | | | | * | Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-272-4/+11
| | | | | * | PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-271-0/+2
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-1/+5
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-271-1/+5
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-262-3/+14
| | | | |\ \ \
| | | | | * | | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-181-0/+10
| | | | | * | | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-271-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix warning about ASCII cast in calling QString::containsThiago Macieira2011-04-261-1/+1
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-261-3/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-3/+1
| | | |\ \ \ \
| | | | * | | | Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-261-3/+1
| | * | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-226-17/+64
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-216-17/+64
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | | | * | | | Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-213-12/+37
| | | | * | | | Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-212-5/+19
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-215-4/+46
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-204-3/+45
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | / / | | | | |_|/ / | | | |/| | |
| | | | * | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-201-3/+9
| | | | * | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-193-0/+36
| | * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-208-64/+120
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-188-64/+120
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-154-53/+50
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Resolve unqualified attached properties correctlyAaron Kennedy2011-04-151-8/+8
| | | | | * | | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-141-5/+13
| | | | | * | | Fix so concurrent jobs produce the correct model resultsBea Lam2011-04-141-39/+28
| | | | | * | | Fix uninitialized variable.Martin Jones2011-04-141-1/+1
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-142-0/+42
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Moving contentY by large values in List/GridView is slowMartin Jones2011-04-142-0/+42
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-131-9/+6
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-9/+6
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-123-2/+22
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | ListView has wrong keyPressEvent behaviour when verticalMartin Jones2011-04-121-2/+2
| | | | | * | | Ensure view is positioned correctly when orientation changes.Martin Jones2011-04-121-0/+2