summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1011-230/+458
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1025-95/+467
| |\
| * | Unify binding optimizer and QtScript binding signal management logicAaron Kennedy2010-03-1011-230/+458
| | |
* | | Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model ↵Martin Jones2010-03-106-0/+16
| |/ |/| | | | | change.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1034-89/+1445
|\ \
| * | Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-105-18/+21
| | | | | | | | | | | | was only working with -1.-1 which looks silly)
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-104-0/+165
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1051-191/+612
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits) Doc Link with the correct library for TCommDbConnPref Remove unused struct update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-104-0/+165
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added unit test for qsoundeffect class.
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-03-0960-420/+2001
| | | |\ \
| | | * | | Added unit test for qsoundeffect class.Kurt Korbatits2010-03-094-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * | | | | URL redirection for font loaderWarwick Allison2010-03-101-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | URL redirection for AnimatedImageWarwick Allison2010-03-102-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | Technically, Location can be relative (never is though...)Warwick Allison2010-03-101-1/+1
| | | | | |
| * | | | | URL redirection for normal images.Warwick Allison2010-03-101-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | URL redirection for components resources.Warwick Allison2010-03-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | URL redirects for border image.Warwick Allison2010-03-102-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | | Implement URL redirection for types and XmlListModel.Warwick Allison2010-03-103-3/+53
| | |_|_|/ | |/| | | | | | | | | | | | | Task-number: QTBUG-7515
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-101-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1057-402/+2526
| | |\ \ \ \
| | * | | | | Link with the correct library for TCommDbConnPrefMartin Jones2010-03-101-1/+1
| | | | | | |
| * | | | | | DocAaron Kennedy2010-03-101-4/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | QTBUG-8448
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1049-186/+606
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unused struct update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| * | | | | 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
* | | | | | | | Schedule view relayout after itemsInserted/Removed()Martin Jones2010-03-106-63/+121
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | So that they handle model changes involving multiple insertion and deletion without entering the event loop.
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0944-347/+1444
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0948-181/+606
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: update Browser.qml to run again Update Autotests Probably fix compile on windows Fix typo in docs Probably fix compile Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| | * | | | | | update Browser.qml to run againAlan Alpert2010-03-091-5/+5
| | | | | | | |
| | * | | | | | Update AutotestsAlan Alpert2010-03-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless given an id, animations in behaviours aren't created until needed. As they are never actually needed in these tests, ids are needed
| | * | | | | | Probably fix compile on windowsAlan Alpert2010-03-091-1/+1
| | | | | | | |
| | * | | | | | Fix typo in docsAlan Alpert2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStringList::appenf is private API, and shouldn't show up in docs.
| | * | | | | | Probably fix compileAlan Alpert2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should fix the current failure when building on windows.
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0943-169/+594
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix qdeclarativevaluetype::font() autotest Initialize member variable in QDeclarativeGridViewAttached Handle itemsInserted/Removed/Moved() correctly for repeater. Add QML support for methods returning QList<QObject *> Compile Update configure.exe to include declarative module by default Make QDeclarativeItem NOTIFY signals canonical Integrate QML's object ownership with the JS collector Remove unused data member. Fix warning. Fix warnings and change geometry-related functions to use reals. When flicking with snap, bias towards moving at least one item. Doc fix.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-093-9/+56
| | | |\ \ \ \
| | | * | | | | Fix qdeclarativevaluetype::font() autotestAaron Kennedy2010-03-091-2/+11
| | | | | | | |
| * | | | | | | 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