summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Expand)AuthorAgeFilesLines
* Revert accidental commitBea Lam2011-08-111-205/+91
* Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-111-91/+205
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-042-0/+16
|\
| * Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
* | Update licenseheader text in source filesJyri Tahtela2011-05-1363-1072/+1072
|/
* 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' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-39/+28
|\ \
| * | Fix so concurrent jobs produce the correct model resultsBea Lam2011-04-141-39/+28
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-3/+0
|\ \ \ | |/ /
| * | ListModel::clear() should not clear rolesBea Lam2011-04-121-3/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-042-3/+4
|\ \ \ | |/ /
| * | XmlListModel should allow types other than application/xmlBea Lam2011-04-041-1/+1
| * | Document using Behaviors with States.Michael Brasser2011-04-041-2/+3
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-011-1/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Canceling image download while reading causes crashMartin Jones2011-03-301-1/+2
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2711-136/+139
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-0/+7
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-092-8/+21
| |\ \
| * | | Doc: Small change to ListModel docsGeir Vattekar2011-03-071-1/+1
| * | | Merge branch 'mimir' into 4.7Martin Smith2011-03-011-1/+1
| |\ \ \
| | * | | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-1/+1
| * | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-235-97/+90
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-2/+2
| |\ \ \ \
| | * | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-2/+2
| | * | | | Merge branch '4.7' into mimirDavid Boddie2010-12-151-2/+2
| | |\ \ \ \
| * | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-175-13/+14
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-151-0/+2
| |\ \ \ \ \ \
| | * | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-081-0/+2
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0720-206/+505
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0420-205/+504
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-048-104/+92
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-1760-60/+61
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-23/+5
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-206-122/+122
* | | | | | | | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-171-0/+7
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-032-8/+21
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-2210-132/+102
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-201-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix warning about id maybe used when uninitialisedThiago Macieira2011-02-201-1/+1
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-90/+80
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-049-131/+101
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-262-2/+2
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-11/+16
| | * | | | | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-0/+2
| | * | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-25/+36
| | * | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2160-145/+96
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-173-64/+34
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1360-60/+61
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |