summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1527-165/+228
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-9/+20
| |\
| | * QDeclarative::isWritable optimization.Michael Brasser2010-03-151-5/+3
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15211-1674/+3768
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (79 commits) Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code Make QML the object allocator more flexible Fix crash on 32-bit platforms Enable GL samplebuffers by default on Mac OS X Fix test Update QmlChanges.txt Update particles autotests Reenable the QML binding optimizer for "safe" optimizations Crash Revert "Use one thread for all instances." Update QmlChanges.txt ...
| | | * Make easing docs more consistent with other grouped property docs.Michael Brasser2010-03-141-4/+8
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-141-0/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation of OpenVG paint engine with OpenVG 1.0
| | | * | Fix compilation of OpenVG paint engine with OpenVG 1.0Rhys Weatherley2010-03-141-0/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9006
| * | | | fix installation of imports librariesYann Bodson2010-03-151-4/+3
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-143-8/+34
| |\ \ \
| | * | | Fix typo.Michael Brasser2010-03-141-1/+1
| | | | |
| | * | | Use reliable local server for HTTP testing.Warwick Allison2010-03-142-7/+33
| | | | | | | | | | | | | | | | | | | | Test font redirection.
| * | | | Make the loader a focusscope.Yann Bodson2010-03-141-1/+3
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-12210-1665/+3727
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (75 commits) Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code Make QML the object allocator more flexible Fix crash on 32-bit platforms Enable GL samplebuffers by default on Mac OS X Fix test Update QmlChanges.txt Update particles autotests Reenable the QML binding optimizer for "safe" optimizations Crash Revert "Use one thread for all instances." Update QmlChanges.txt Remove Qt.closestAngle(). Fix importing qml modules from rcc resources Crash Cosmetic tweaks ...
| | * | Fix installation of imports librariesTobias Hunger2010-03-123-8/+7
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1214-112/+119
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed a Valgrind warning. Made QGLExtensions::glExtensions() thread-safe. QTreeView: Optimise QTreeViewPrivate::viewIndex Optimize QSortFilterProxyModel QTreeView: speedup more QTreeViewPrivate::layout(-1) Remove debug output from qt_eglproperties_set_glformat Delete the QGLContext in ~QX11GLPixmapData Made QGLTextureCache::instance() threadsafe. Add support for QFont::NoAntialias on QWS Fix 1-bit to 8-bit conversion for bitmap fonts on QWS
| | * | Removed a Valgrind warning.Trond Kjernåsen2010-03-121-1/+2
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| | * | Made QGLExtensions::glExtensions() thread-safe.Trond Kjernåsen2010-03-122-21/+18
| | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1213-90/+99
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QTreeView: Optimise QTreeViewPrivate::viewIndex Optimize QSortFilterProxyModel QTreeView: speedup more QTreeViewPrivate::layout(-1) Remove debug output from qt_eglproperties_set_glformat Delete the QGLContext in ~QX11GLPixmapData Made QGLTextureCache::instance() threadsafe. Add support for QFont::NoAntialias on QWS Fix 1-bit to 8-bit conversion for bitmap fonts on QWS
| | * | QTreeView: Optimise QTreeViewPrivate::viewIndexOlivier Goffart2010-03-111-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by first looking around the last find item. This was already done, but only for the 4 closest item. Now start searching from the last index and continue. Reviewed-by: Gabriel Task-number: QTBUG-8886
| | * | Optimize QSortFilterProxyModelOlivier Goffart2010-03-111-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - use QHash instead of QMap - use QVector::reserve when the size is known Reviewed-by: Gabriel
| | * | QTreeView: speedup more QTreeViewPrivate::layout(-1)Olivier Goffart2010-03-112-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | Specially when called from expandAll Reviewed-by: Gabriel
| | * | Remove debug output from qt_eglproperties_set_glformatTom Cooksey2010-03-111-3/+1
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | Delete the QGLContext in ~QX11GLPixmapDataTom Cooksey2010-03-118-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also includes changes which allow QGLContext to not own it's own QEglContext. With X11GL, the QEglContext gets reused by multiple QGLContexts so it is important QGLContext doesn't delete it. Reviewed-By: TrustMe
| | * | Made QGLTextureCache::instance() threadsafe.Trond Kjernåsen2010-03-112-21/+7
| | | | | | | | | | | | | | | | Reviewed-by: Tom Cooksey
| | * | Add support for QFont::NoAntialias on QWSPaul Olav Tvete2010-03-111-3/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5936 Reviewed-by: Eskil
| | * | Fix 1-bit to 8-bit conversion for bitmap fonts on QWSPaul Olav Tvete2010-03-111-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage doesn't know that we are abusing Format_Indexed8 as an alpha map. The proper solution is to add new image formats. This is just a quick fix. Task-number: QTBUG-5936 Reviewed-by: Jeremy
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-123-24/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned. Delayed initialization of gstreamer video widget.
| | * | | QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned.Dmytro Poplavskiy2010-03-121-4/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andrew den Exter
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-129-18/+1032
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-1068-454/+2227
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-09346-6306/+9630
| | |\ \ \ \ \
| | * | | | | | Delayed initialization of gstreamer video widget.Dmytro Poplavskiy2010-03-082-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves time/memory when the video widget control is not used, and allows using of audio only QMediaPlayer in non gui applications. Reviewed-by: Justin McPherson
* | | | | | | | Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRangeMartin Jones2010-03-151-2/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9000
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-12108-552/+1297
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1212-0/+354
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-126-57/+21
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add new declarative photoviewer demoYann Bodson2010-03-1212-0/+354
| | | | | | | | | |
| * | | | | | | | | Tweak benchmarkAaron Kennedy2010-03-121-1/+2
| | | | | | | | | |
| * | | | | | | | | Optimization: Use linked list for context childrenAaron Kennedy2010-03-124-33/+67
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Remove dead codeAaron Kennedy2010-03-121-31/+0
| | | | | | | | |
| * | | | | | | | Make QML the object allocator more flexibleAaron Kennedy2010-03-124-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By allocating memory internally we improve the opportunity for optimization.
| * | | | | | | | Fix crash on 32-bit platformsAaron Kennedy2010-03-121-1/+1
| |/ / / / / / /
| * | | | | | | Enable GL samplebuffers by default on Mac OS XAaron Kennedy2010-03-121-0/+5
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-124-65/+75
| |\ \ \ \ \ \ \
| | * | | | | | | Update QmlChanges.txtYann Bodson2010-03-121-2/+3
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-127-82/+17
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update particles autotestsYann Bodson2010-03-123-63/+72
| | | | | | | | | |
| * | | | | | | | | Fix testAaron Kennedy2010-03-121-9/+9
| | | | | | | | | |
| * | | | | | | | | Reenable the QML binding optimizer for "safe" optimizationsAaron Kennedy2010-03-125-30/+81
| | | | | | | | | |
| * | | | | | | | | CrashAaron Kennedy2010-03-121-1/+1
| | |/ / / / / / / | |/| | | | | | |