summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlpixmapcache.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-611/+0
| | | | QDeclarativeXXX.
* Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
|
* Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-161-2/+2
|\ \
| * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-2/+2
| |/
* | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-161-15/+23
|/ | | | | | | | | Setting an image source to image://providerid/imageid will pass the request for imageid to the provider registered for providerid. QmlImageProvider::request() is run in a low priority thread, so the main thread is not blocked while the image is loaded/rendered. Reviewed-by: Aaron Kennedy
* Fix test.Martin Jones2010-02-051-7/+17
|
* Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-051-11/+17
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041-1/+2
| | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
* Really run image reader in its own thread.Martin Jones2010-02-031-122/+135
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-011-2/+7
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-011-122/+242
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/qmlpixmapcache.cpp
| * | Ensure pixmaps can be retrieved even if they do not fit in the QPixmapCache.Warwick Allison2010-02-011-2/+8
| | | | | | | | | | | | Fixes QT-2280
* | | Compile on machines without SCHED_IDLEMartin Jones2010-02-011-1/+1
| |/ |/|
* | Move image network access into a separate thread, with decoding.Martin Jones2010-01-291-107/+214
| |
* | Remove qHash(QUrl) duplicateMartin Jones2010-01-201-9/+2
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-01-201-0/+7
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-201-11/+11
| |\ \ | | | | | | | | | | | | into kinetic-declarativeui
| * | | Compile with Qt 4.6.1Aaron Kennedy2010-01-201-0/+7
| | | |
* | | | Add qHash(QUrl) for QmlPixmapCache.Martin Jones2010-01-201-0/+5
| |/ / |/| |
* | | Use Q_GLOBAL_STATIC for static global.Martin Jones2010-01-201-11/+11
|/ /
* | Avoid using QUrl::toString() in QmlPixmapCache.Martin Jones2010-01-201-20/+29
|/
* Move choice of pipelining to the point request.Warwick Allison2010-01-111-0/+1
| | | | (based on advice from Thiago)
* Optimization: signal connectionsAaron Kennedy2009-12-211-2/+15
|
* Remove unnecessary locking.Martin Jones2009-12-211-14/+10
|
* Fix image and pixmapcache tests.Martin Jones2009-12-141-1/+3
|
* Don't rely on Qt3SupportMartin Jones2009-12-141-3/+2
|
* Compile.Martin Jones2009-12-141-0/+1
|
* Decode images loaded via network in a separate thread.Martin Jones2009-12-141-143/+281
|
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-12-031-3/+6
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * fix includesOswald Buddenhagen2009-12-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | - include headers from own directory with "" - include headers from own project without private/ - sort includes from most specific to most generic - make headers self-contained - some whitespace unification no attempt was made at making the qt includes consistent regarding the use of module names and forwarding headers. no attempt was made at sorting includes.
* | Minor optimization of image lookup from cache.Michael Brasser2009-12-031-34/+36
|/
* Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-021-2/+2
| | | | It seems we're going to have to so a syncqt/configure in Qt modules.
* Remove include styles that rely on configure.Warwick Allison2009-12-011-1/+1
| | | | May help modularization (syncqt and configure are Qt-specific).
* Add Image auto testMartin Jones2009-11-191-3/+14
| | | | | Also fix qmlpixmapcache error reporting and Image and BorderImage progress reporting for null images.
* Do not use "QtDeclarative/XXX" style includes in declarative module code,Warwick Allison2009-11-121-1/+1
| | | | as it breaks reinstalling the module against existing Qt.
* Rename QmlGraphicsPixmapCache to QmlPixmapCache.Michael Brasser2009-11-041-0/+283