summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add screenshots for most examples and demosBea Lam2010-06-2250-33/+283
|
* Rename example: edit -> textselectionBea Lam2010-06-226-0/+16
|
* Clean up some examplesBea Lam2010-06-2237-374/+195
|
* Rename example and add minor improvementsBea Lam2010-06-221-17/+32
|
* Rename example image fileBea Lam2010-06-222-1/+1
|
* Spelling fixBea Lam2010-06-221-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2129-109/+282
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Avoid printing a warning Only steal hover events when enabled, in QtDemo's qml integration Allow things that load SameGame to disable the Quit button Seems to fix the keyboard focus confusion Fix test ListView doc improvements and examples clean up Doc fixes Fix event forwarding in QDeclarativeFlickable. doc: improve Repeater model docs. doc: couple more performance tips. BorderImage is not updated when border values change XmlListModel: Don't lock while doing the slow bit. Auto test for QTBUG-11507 Properly update childrenRect for position changes and shrinking.
| * Avoid printing a warningAlan Alpert2010-06-211-1/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-2163-243/+1322
| |\
| | * Fix testBea Lam2010-06-181-0/+3
| | |
| | * ListView doc improvements and examples clean upBea Lam2010-06-1811-34/+53
| | |
| | * Doc fixesBea Lam2010-06-182-23/+13
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1713-49/+202
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix event forwarding in QDeclarativeFlickable. doc: improve Repeater model docs. doc: couple more performance tips. BorderImage is not updated when border values change XmlListModel: Don't lock while doing the slow bit. Auto test for QTBUG-11507 Properly update childrenRect for position changes and shrinking.
| | | * Fix event forwarding in QDeclarativeFlickable.Alexis Menard2010-06-171-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flickable element filters all events of its children and store the press event to replay it if there is a release or if the scrolling didn't happen. The issue was that the event and the item stored to "replay" the press event might not be the item that is interessted by the event. Let say you have a translucent overlay on top of an other item. Previously all events will be send to the overlay and not to the item underneath. This happen beause QGraphicsView propagate events from top to bottom (stacking order) so the overlay will be the first child filtered by the flickable. So we need to repropagate the event through the normal process to the event delivery mechanism of QGraphicsView will work properly. Also we need to unset the mouse grabber since after the first press it might be set to a wrong item. We also need to replay the release by ourself on the new mouse grabber but only if we need to send again the press. Reviewed-by:Yann Bodson
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-173-1/+16
| | | |\
| | | * | doc: improve Repeater model docs.Martin Jones2010-06-171-10/+3
| | | | |
| | | * | doc: couple more performance tips.Martin Jones2010-06-171-0/+12
| | | | |
| * | | | Only steal hover events when enabled, in QtDemo's qml integrationAlan Alpert2010-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure whether it was the correct behaviour for a MouseArea to have when enabled is false but hoverEnabled is true, that it would still get hover events. But the current behaviour is unambigious and correct. Task-number: QTBUG-11564
| * | | | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-213-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I missed any, just set inAnotherDemo to true on the SameGame root item. Task-number: QTBUG-11562
| * | | | Seems to fix the keyboard focus confusionAlan Alpert2010-06-211-2/+5
| | |_|/ | |/| | | | | | | | | | Task-number: QTBUG-11411
| * | | BorderImage is not updated when border values changeYann Bodson2010-06-173-1/+16
| | |/ | |/| | | | | | | | | | Task-number: QTBUG-11509 Reviewed-by: Michael Brasser
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-1763-391/+1181
| |\ \
| | * | Auto test for QTBUG-11507Bea Lam2010-06-173-0/+28
| | | |
| | * | Properly update childrenRect for position changes and shrinking.Michael Brasser2010-06-173-5/+84
| | | | | | | | | | | | | | | | Task-number: QTBUG-11465
| * | | XmlListModel: Don't lock while doing the slow bit.Martin Jones2010-06-171-30/+41
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-2118-93/+481
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Start the implementation of in-place recoding for images Fix a possible crash with the EVR video renderer in windows Don't do opaque detection when copying a sub-rect of a QPixmap. Optimized QPixmap::fromImage for raster pixmaps. Doc: Small change to QAbstractItemDelegate::editorEvent() Typo in qcleanlooksstyle.cpp Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types. Speed up calls to QPainter::setCompositionMode when the mode is unchanged
| * | | Start the implementation of in-place recoding for imagesBenjamin Poulain2010-06-2012-95/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, with the graphics system raster, converting from images to QPixmap often needs to allocate a new image to convert the right format. For example, for an image in ARGB32 of 10 mbytes, we need to allocate a second image of 10 mbytes in ARGB32_PM to convert the source image in the right format for pixmap. This can create a hight peak of memory, and is a bit slower than it should. This patch introduce in-place conversion of images when they are loaded with QPixmap::loadFromData(). The images are loaded in their default format by QImageReader, and are then converted in-place, trying to reduce memory allocations. Reviewed-by: Samuel Rødal
| * | | Fix a possible crash with the EVR video renderer in windowsThierry Bastian2010-06-181-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happn when the component can be instanciated but not all the services are available on it. The code is now more robust. Reviewed-By: gabi
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-176-7/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Don't do opaque detection when copying a sub-rect of a QPixmap. Optimized QPixmap::fromImage for raster pixmaps. Doc: Small change to QAbstractItemDelegate::editorEvent() Typo in qcleanlooksstyle.cpp Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types. Speed up calls to QPainter::setCompositionMode when the mode is unchanged
| | * | | Don't do opaque detection when copying a sub-rect of a QPixmap.Samuel Rødal2010-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pixmap is non-opaque in the first place most likely a reasonably sized sub-rect is also non-opaque, so this check is a waste in 90 % of the cases. Reviewed-by: Gunnar Sletta
| | * | | Optimized QPixmap::fromImage for raster pixmaps.Samuel Rødal2010-06-171-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we know that the QImage is ARGB32 or ARGB32_Premultiplied and doesn't contain any alpha pixels we can treat it as RGB32 when doing the conversion. Reviewed-by: Gunnar Sletta
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17243-5030/+7796
| | |\ \ \
| | | * | | Typo in qcleanlooksstyle.cppOlivier Goffart2010-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11506
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Geir Vattekar2010-06-17242-5029/+7795
| | | |\ \ \
| | | | * | | Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid marking the composition mode as dirty and calling into the extended engine if the composition mode that the application wants to set is the same that's currently used. Reviewed-by: Gunnar
| | * | | | | Doc: Small change to QAbstractItemDelegate::editorEvent()Geir Vattekar2010-06-171-2/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2446 Reviewed-by: Marius Bugge Monsen
| | * | | | Doc: Specified QAbstractEventDispatcher::filterEvent()'s argument types.Geir Vattekar2010-06-171-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10904 Reviewed-by: Morten Engvoldsen
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-1716-99/+541
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 6623b5da196390748dc619461739f9cb84524736
| * | | | | Updated WebKit to 6623b5da196390748dc619461739f9cb84524736Simon Hausmann2010-06-1716-99/+541
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38401> || Make repaint throttling parameters configurable runtime. || || <https://webkit.org/b/40073> || [Qt] rendering error in mediawiki || || <https://webkit.org/b/36463> || Spatial Navigation: make it work with focusable elements in overflow content || || <https://webkit.org/b/39857> || GIFs loop one time too few || || <https://webkit.org/b/36818> || [Qt] Animated GIF images does not animate 10x as expected by default. || || <https://webkit.org/b/37844> || [Qt] Image::drawTiled animations does not work || || <https://webkit.org/b/40567> || [Qt] QtWebKit crashes while initializing flash plugin 10.1.53.64... || || <https://webkit.org/b/39439> || Spatial Navigation: using offset{Left,Top} is not enough to get the proper inner frames position || || <https://webkit.org/b/39195> || Spatial Navigation: refactor scrollInDirection to work with scrollable content ||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-1726-67/+623
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added more DITA output to the XML generator Usefully convert from QtScript object/array to QVariant document QSslSocket::systemCaCertificates() change in changelog Implement QIODevice::peek() using read() + ungetBlock(). Allocate the memory for QtFontSize when count > 1 doc: Added more DITA output to the XML generator Defer allocation of GIF decoding tables/stack. Make sure only started gestures can cause cancellations Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) qmake: Fix CONFIG += exceptions_off with the MSVC project generator. Fix some kind of race condition while using remote commands. Work around ICE in Intel C++ Compiler 11.1.072 Reduce the memory consumption of QtFontStyle
| * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-179-22/+263
| |\ \ \ \ \
| | * | | | | Usefully convert from QtScript object/array to QVariantKent Hansen2010-06-178-22/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For arrays, the conversion would crash if the array was cyclic. Introduce a set that keeps track of which objects are being converted, and return an empty list when a cycle is detected. For other types of objects, the object was previously attempted to be converted to a primitive, which typically meant you would get the string representation ("[object Object]"), since most (practically all) objects can be converted to a string -- not useful at all. Change the conversion so it converts the object to a QVariantMap instead. This was already done for slots that took a QVariantMap as argument, but only one level deep. Make the conversion recursive, using the same mechanism as for arrays to detect cycles. This change also means that you get a meaningful JS object => QVariant => JS object roundtrip. It also aligns the behavior with the Qt WebKit bridge. Update the documentation to describe the new behavior. The 4.7 changelog will also be updated under "important behavioral changes". This change exposed an issue with one of the QML autotests: A JS object was assigned to a QVariant property, which caused it to be converted to a string (rather than a QVariantMap) -- just shows that the previous behavior was unintuitive). Later, this variant property is compared to another object, the intention being to compare the _properties_ of the two objects; but because the variant property contained a string, this would cause the other operand (object) to be converted to a string as well ("[object Object]"), causing a meaningless test pass. Change the test to deserialize both objects using JSON.stringify, and compare the resulting strings, so that actual JS object => QVariant(Map) => JS object roundtrip is tested (the intention). Task-number: QTBUG-3511 Reviewed-by: Olivier Goffart
| | * | | | | document QSslSocket::systemCaCertificates() change in changelogPeter Hartmann2010-06-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
| * | | | | Implement QIODevice::peek() using read() + ungetBlock().Andreas Kling2010-06-162-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was doing ungetChar() in a loop. Task-number: QTBUG-9654 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: mread
| * | | | | Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix a regression introduced by 71ba2b0973d291e991e1498c266e69d6640c8531. In the case count >= 1 && count < 8, no memory is allocated. Reviewed-by: Andreas Kling
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-1615-38/+243
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added more DITA output to the XML generator Defer allocation of GIF decoding tables/stack. Make sure only started gestures can cause cancellations Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) qmake: Fix CONFIG += exceptions_off with the MSVC project generator. Fix some kind of race condition while using remote commands. Work around ICE in Intel C++ Compiler 11.1.072 Reduce the memory consumption of QtFontStyle
| | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1666-530/+733
| | |\ \ \ \ \
| | | * | | | | Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit creates many image readers but will only retrieve the dimensions until the image itself is actually needed (i.e appears in the viewport.) This avoids allocating 16kB per GIF image until it's time to actually decode it. Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * | | | | Make sure only started gestures can cause cancellationsThomas Zander2010-06-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The design is that calling setGestureCancelPolicy on the gesture that is in starting state, and is accepted can cause other gestures to be cancelled. So change the logic to follow this, which means we won't try to execute the cancel strategy if the gesture was never accepted and avoid the crash detailed in the task. Reviewed-by: Denis Task-number: QTBUG-9771
generated by cgit v0.12 at 2025-01-19 10:54:38 (GMT)