summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Handle EGLSurfaces better, including more error detectionTom Cooksey2010-03-106-10/+21
| | | | | | | Note: This changes QX11PixmapData::gl_surface to a void* to enable build on 64-bit systems where EGLSurface is a pointer. Reviewed-By: TrustMe
* Make sure pixmap hooks get installed so EGL surfaces are cleaned upTom Cooksey2010-03-101-0/+4
| | | | Reviewed-By: TrustMe
* Don't show resize cursor for fixed-size windowsPaul Olav Tvete2010-03-101-2/+4
| | | | | Task-number: QTBUG-8144 Reviewed-by: Jørgen Lind
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-096-14/+727
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't write byte-order-mark after seek() TextCodec on Symbian: use the native symbian backend for text codecs.
| * Don't write byte-order-mark after seek()Paul Olav Tvete2010-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark has been called, but we don't store that information. This commit is an improvement for the default case when generateByteOrderMark is false, and also when seeking to any other position than 0. Task-number: QTBUG-6295 Reviewed-by: Olivier
| * TextCodec on Symbian: use the native symbian backend for text codecs.Olivier Goffart2010-03-095-13/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian, we would use the native textcodec for anything but UTF and Latin1. Some codec that are not present by default in symbian are still present inside Qt, but if there is symbian codecs that exists for those, Symbian codecs have priority. Most of code has been contributed by the Obrit i18n team. Task-number: QT-2471 (Symbian part) Task-number: QT-2627 Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-094-34/+61
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Updates to qsoundeffect backends.
| | | * Updates to qsoundeffect backends.Kurt Korbatits2010-03-094-34/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pulseaudio backend: moved write code out of callback to reduce upload failure (30%->10%) - pulseaudio backend: add recovery code to retry on failed upload - changed delete to deleteLater, unit test was craching on cleanup - qmedia backend: removed connect to mutedChanged and volumeChanged signals, not needed, emitted by main class. Reviewed-by:Derick Hawcroft
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-09463-7555/+17849
|\ \ \ \
| * | | | Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/HintTrond Kjernåsen2010-03-0910-40/+45
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kim
| * | | | QTreeView: let the dataChanged signal refresh the hasChildren attribute.Olivier Goffart2010-03-091-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | That is required for the Locals & Watchers view in Creator. Task-number: QTBUG-7115 Reviewed-by: Thierry
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0911-242/+184
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0811-242/+184
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| | | * | Fixed bounds calculation in QtSvg.Kim Motoyoshi Kalland2010-03-0810-226/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an auto-test failure after fixing QTBUG-8733. The calculated element bounds should now be much tighter and respect the width of non-cosmetic pens. Task-number: QTBUG-8733 Reviewed-by: Trond
| | | * | Fixed vector-effect property output from QSvgGenerator.Kim Motoyoshi Kalland2010-03-081-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vector-effect property is not inherited by default, so it must be set on each item with a stroke. It is not sufficient to set it on G nodes. Task-number: QTBUG-8733 Reviewed-by: Trond
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-096-48/+431
| |\ \ \ \
| | * | | | Minor cleanup.Michael Brasser2010-03-092-26/+15
| | | | | |
| | * | | | Add highlightRangeMode and snapMode to GridView.Martin Jones2010-03-092-20/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brings ListView and GridView APIs closer. Task-number: QTBUG-8779
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0921-499/+241
| | |\ \ \ \
| | * | | | | Minor anchors.fill optimization.Michael Brasser2010-03-094-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-716
| * | | | | | Move pixmapChanged signal to QDeclarativeImageYann Bodson2010-03-094-8/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Task-number: QTBUG-6334
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0826-535/+254
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Always copy the qmldir files into the build directoryTobias Hunger2010-03-084-7/+7
| | | |/ / | | |/| | | | | | | | | | | | ... even when -prefix is set
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-084-7/+10
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix to mainwindow demo Fix build on Maemo X11 Fix crash on Win with 16bit screendepth when copy/pasting images Enable cleanup hooks when creating an EGL surface for a pixmap
| | | * | Fix build on Maemo X11Tom Cooksey2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Tobias Hunger
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-08166-976/+11200
| | | |\ \
| | | | * | Enable cleanup hooks when creating an EGL surface for a pixmapTom Cooksey2010-03-082-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | Fix crash on Win with 16bit screendepth when copy/pasting imagesaavit2010-03-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4687 Reviewed-by: Trond
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0810-467/+200
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove duration property from QSoundEffect. Fix effects.pri. Refactor QSoundEffect.
| | | * | | | Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | * | | | Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | * | | | Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | * | | | | clearFocus() before setParentItem(0) on an item with focus.Martin Jones2010-03-081-0/+2
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-082-0/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Make the animation property of Behavior deferred.Michael Brasser2010-03-082-0/+2
| | | | | | |
| | * | | | | fix QDeclarativeItem sceneEvent handlingYann Bodson2010-03-081-3/+3
| | |/ / / /
| | * | | | Particles optimization and doc fixes.Michael Brasser2010-03-081-3/+5
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-082-10/+12
| | |\ \ \ \
| | | * | | | Fix Qt.tint() algorithmAaron Kennedy2010-03-081-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-2424
| | | * | | | Disallow upper case property, signal and method names in QMLAaron Kennedy2010-03-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QT-2976
| | * | | | | Add Flipable example.Bea Lam2010-03-081-38/+13
| | |/ / / / | | | | | | | | | | | | | | | | | | Task-number: QT-2824
| * | | | | Use one thread for all instances.Bea Lam2010-03-081-15/+19
| |/ / / / | | | | | | | | | | | | | | | Task-number: QT-2831
| * | | | Remove code dupliation in fixupX/Y(), flickX/Y()Martin Jones2010-03-087-467/+326
| | | | | | | | | | | | | | | | | | | | Also some minor perf improvements by avoiding signal/slot connection
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-089-24/+30
| |\ \ \ \
| | * | | | Optimize Rectangle, Image, and Text creation.Michael Brasser2010-03-089-24/+30
| | | | | |
| * | | | | Add PathView.isCurrentIndex and PathView.view attached propertiesMartin Jones2010-03-083-73/+181
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Adding PathView attached properties to be in line with other views. Task-number: QT-319
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0731-1460/+607
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML Minor perf improvement when running QML script blocks Fix qdeclarative{audio,video} tests. Don't assume documents are in UTF-8. Add basic support for explicit newParent in ParentAnimation. Delete uninspiring example. Fix compiler warning on RVCT Use new enum syntax for value types. Expect fail in currentIndex test for now. Allow unquoted enum syntax for value types More declarative examples cleanup. Improve declarative tabs example. Fix test leaks Use _data() for some tests Add missing NOTIFYs to timer, xmllistmodel, xmlrole Document new ParentChange properties. declarative examples cleanup Fix test Update QmlChanges.txt ...
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0531-1460/+607
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML Minor perf improvement when running QML script blocks Fix qdeclarative{audio,video} tests. Don't assume documents are in UTF-8. Add basic support for explicit newParent in ParentAnimation. Delete uninspiring example. Fix compiler warning on RVCT Use new enum syntax for value types. Expect fail in currentIndex test for now. Allow unquoted enum syntax for value types More declarative examples cleanup. Improve declarative tabs example. Fix test leaks Use _data() for some tests Add missing NOTIFYs to timer, xmllistmodel, xmlrole Document new ParentChange properties. declarative examples cleanup Fix test Update QmlChanges.txt ...