summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-121-3/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-111-3/+4
| |\
| | * doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-122-6/+9
|\ \ \
| * | | Only modify pixmap cache reply when protected by a mutexAaron Kennedy2010-08-121-1/+1
| * | | Fix broken example codeBea Lam2010-08-121-5/+8
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-127-18/+18
|\ \ \ | |/ / |/| |
| * | Fix typos in docsThomas Zander2010-08-111-3/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-116-15/+15
| |\ \ | | |/ | |/|
| | * Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-119-10/+11
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-106-15/+15
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-106-15/+15
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-106-15/+15
| | | | |\ \
| | | | | * | QtDeclarative: get rid of warnings in public headerOlivier Goffart2010-08-092-6/+6
| | | | | * | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-093-21/+24
| | | | | |\ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0610-41/+67
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-053-147/+100
| | | | | |\ \ \ \
| | | | | * | | | | Doc: Fixed qdoc warnings.David Boddie2010-08-053-7/+7
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-041-1/+1
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0479-807/+1647
| | | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1621-459/+571
| | | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | | Doc: Fixed QML documentation errors.David Boddie2010-07-161-3/+3
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Henrik Hartz2010-08-1111-25/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-119-11/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-112-11/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-109-11/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-109-11/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-096-9/+22
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | XmlListModel doc fixesBea Lam2010-08-091-1/+7
| | | | | * | | | | | | | | | Explain Flipable example furtherBea Lam2010-08-091-4/+10
| | | | | * | | | | | | | | | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
| | | | | * | | | | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-093-3/+4
| | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-097-8/+8
| | | | |/ / / / / / / / /
| * | | | | | | | | | | | Compile on SymbianMartin Jones2010-08-112-14/+10
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-111-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Don't destroy ListModel child list nodes.Martin Jones2010-08-112-11/+28
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Remember to reset clipping when overriding paint in QDeclarativeItemHenrik Hartz2010-08-111-1/+3
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Don't double-add item change listeners.Michael Brasser2010-08-101-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-102-5/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | XmlListModel doc fixesBea Lam2010-08-091-1/+7
| * | | | | | | | Explain Flipable example furtherBea Lam2010-08-091-4/+10
* | | | | | | | | Associate qmlInfo() documentation with QDeclarativeEngineMartin Jones2010-08-101-0/+1
|/ / / / / / / /
* | | | | | | | PathView required some diagonal movement before a drag was initiated.Martin Jones2010-08-091-1/+1
|/ / / / / / /
* | | | | | | Fix broken example codeBea Lam2010-08-061-8/+11
* | | | | | | Top-level QML item should not have special focus handling.Michael Brasser2010-08-061-7/+4
* | | | | | | Remove some warningsMartin Jones2010-08-051-6/+9
| |_|_|_|_|/ |/| | | | |
* | | | | | Improve docs on QML Animation page and associated elementsBea Lam2010-08-057-26/+67
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-052-16/+1
|\ \ \ \ \ \
| * | | | | | Re-enable script program caching on Symbian (used to be disabled due to crash...Joona Petrell2010-08-051-4/+0
| * | | | | | Make sure onFocusChanged is correctly emitted for items in a FocusScope.Michael Brasser2010-08-051-12/+1
| | |_|_|_|/ | |/| | | |