summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into qtquick2history/qtquick2axis2011-04-271-3/+1
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-271-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 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-261-39/+28
|\| | |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-39/+28
| |\| |
| | * | 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 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2Gunnar Sletta2011-04-1413-151/+147
|\ \ \ \ \
| * | | | | Merge branch 'master' into qtquick2Michael Brasser2011-04-1413-151/+147
| |\| | | |
| | * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-131-3/+0
| | |\| | |
| | | * | | 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 remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-3/+4
| | |\| | |
| | | * | | 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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-0412-137/+143
| | |\ \ \ \
| | | * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-021-1/+2
| | | |\| | |
| | | | * | | 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 remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3111-136/+141
| | | |\| |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2811-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
| | | | | |_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | |
| | * | / | | | | | | | | | Remove Font Smoothing hack for OS XJiang Jiang2011-03-311-8/+0
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Delete texture objects through QSGContextGunnar Sletta2011-04-121-24/+35
* | | | | | | | | | | | | Remove QSGTextureRef, we're not only using QSGTextureGunnar Sletta2011-04-122-21/+22
|/ / / / / / / / / / / /
* | | | | | | | | | | | Fix up public / private scene graph APIGunnar Sletta2011-03-301-1/+2
* | | | | | | | | | | | Move QSGTexture::setImage() to QSGContext::createTexture(QImage)Gunnar Sletta2011-03-221-10/+5
* | | | | | | | | | | | Merge branch 'textures-take2' into qtquick2Gunnar Sletta2011-03-212-26/+159
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Always go through QSGTexture for scenegraph based QDeclarativePixmapGunnar Sletta2011-03-181-6/+24
| * | | | | | | | | | | Big texture changesGunnar Sletta2011-03-172-53/+51