summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-099-18/+1032
|\ | | | | | | | | | | | | | | 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-092-1/+60
| | | | | | | | | | | | | | | | | | | | 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-097-17/+972
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0919-82/+95
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Minimal fix to get the svgalib example to compile Fix alignment of text with negative right bearing Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/Hint QTreeView: let the dataChanged signal refresh the hasChildren attribute.
| * | | Minimal fix to get the svgalib example to compilePaul Olav Tvete2010-03-095-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confirmed to work in 16 and 32 bit modes. Patch made by David Boddie. Testing and README by me. Task-number: QTBUG-7403 Reviewed-by: David Boddie
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-091061-22112/+41839
| |\ \ \
| | * | | Renamed QPainter::Fragment/Hint -> QPainter::PixmapFragment/HintTrond Kjernåsen2010-03-0911-45/+50
| | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix alignment of text with negative right bearingEskil Abrahamsen Blomfeldt2010-03-093-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 5364fd96a72c89b281f0540da909fe64d0575ccf and some related changes, we made sure that the natural text width used for calculating bounding rects and line breaks in the text, takes the right bearing of the last glyph into consideration. As a side-effect, this broke alignment of text, as we want to align based on the accumulated advance of the glyphs, not based on the actual width. This is in particular important when aligning monospaced text, since the text can become misaligned if the glyphs extend beyond their advance. The bug was visible e.g. in line numbers ending with 2 in Qt Creator on X11, which would be shifted one pixel to the left compared to other line numbers. Task-number: QTBUG-8864 Reviewed-by: Thorbjørn
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0918-251/+1326
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add license header Fixed bounds calculation in QtSvg. Fixed vector-effect property output from QSvgGenerator. Added text benchmarks from qtbench to tests/benchmarks
| * | | Add license headerOlivier Goffart2010-03-091-0/+41
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-0918-251/+1285
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0818-251/+1285
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0818-251/+1285
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0811-226/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Added text benchmarks from qtbench to tests/benchmarksSamuel Rødal2010-03-084-1/+1062
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar Sletta
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0913-71/+561
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move pixmapChanged signal to QDeclarativeImage Minor cleanup. Add highlightRangeMode and snapMode to GridView. Minor anchors.fill optimization. Use one thread for all instances.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-098-48/+535
| |\ \ \ \ \
| | * | | | | Minor cleanup.Michael Brasser2010-03-092-26/+15
| | | | | | |
| | * | | | | Add highlightRangeMode and snapMode to GridView.Martin Jones2010-03-094-20/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0925-507/+257
| | |\ \ \ \ \
| | * | | | | | 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-0844-546/+341
| |\ \ \ \ \ \
| * | | | | | | Use one thread for all instances.Bea Lam2010-03-081-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-084-7/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Always copy the qmldir files into the build directory
| * | | | | | 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/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest.
| * | | | | Fix failing autotest.Alan Alpert2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was probably a bug in the test data.
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-085-8/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 to mainwindow demoThierry Bastian2010-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the mask was not always correctly updated on the "blueTitleBar". Reviewed-by: gabi
| * | | | | 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-08541-12494/+26215
| |\ \ \ \ \
| | * | | | | 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
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-08155-3074/+4257
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (43 commits) clearFocus() before setParentItem(0) on an item with focus. Remove expect fail from ListView currentIndex test fix QDeclarativeItem sceneEvent handling Make the animation property of Behavior deferred. Particles optimization and doc fixes. Add Flipable example. Fix Qt.tint() algorithm Disallow upper case property, signal and method names in QML Remove expected warning Use a better method for installing declarative demos. Fixed declarative examples not being installed. Remove code dupliation in fixupX/Y(), flickX/Y() Add PathView.isCurrentIndex and PathView.view attached properties Stop benchmark from crashing. Optimize Rectangle, Image, and Text creation. Make compile following QDeclarativeMetaProperty renaming Fixed declarative demos not being installed. Make test compile optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML ...
| * | | | | | | clearFocus() before setParentItem(0) on an item with focus.Martin Jones2010-03-082-3/+9
| | | | | | | |
| * | | | | | | Remove expect fail from ListView currentIndex testMartin Jones2010-03-081-3/+7
| | | | | | | |
| * | | | | | | 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
| |/ / / / / /
generated by cgit v0.12 at 2025-02-07 12:54:33 (GMT)