summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Ensure sourcesize is in pixmap cache key.Warwick Allison2010-06-241-0/+6
| | | | Task-number: QTBUG-11645
* doc: note that calling methods before component completion may have no effectMartin Jones2010-06-233-0/+36
| | | | So use Component.onCompleted:
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-231-0/+1
|\
| * Use Pen with Qt::MiterJoin when drawing Rectangles with gradientsBea Lam2010-06-231-0/+1
| | | | | | | | Task-number: QTBUG-11624
* | Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-235-56/+122
|/ | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
* Ensure the view is correctly positioned at component complete.Martin Jones2010-06-232-0/+17
| | | | | | If a currentIndex has been specified, ensure the view starts at the correct position immediately, rather than scrolling to it after startup.
* References to undefined variables throws a ReferenceErrorAaron Kennedy2010-06-232-18/+11
| | | | This is consistent with normal JavaScript
* Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-223-5/+2
|\ | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-221-1/+1
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-221-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-221-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | | * Update qmlchanges from import org.webkit to QtWebKitAlexis Menard2010-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Make sure ValueRecord's DeviceTables is cleaned up on failure qdoc3: Build fix for regression in e2f0e728e Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup Fix null HB_Device** dereference on exit in Harfbuzz GPOS code Doc: Relicensed the documentation under the GNU FDL version 1.3. doc: Added more DITA output to the XML generator Designer: Prevent QButtonGroup from being added for Q3ButtonGroup. Fix for a leak in the mac style. Doc: Fixing bugs to style and script doc: Added more DITA output to the XML generator Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() Fix compiler warnings in QtGui (text,painting). Allow Unix to generate unique UUIDs if /dev/urandom exists. Allow GNU Free Documentation license header. Add missing license header. Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072 Fix example compile and runtime warnings, webkit examples not built. qgl_cl_p.h is no longer existent Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Doc: Fixed documentation errors. ...
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-211-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup Fix null HB_Device** dereference on exit in Harfbuzz GPOS code Doc: Relicensed the documentation under the GNU FDL version 1.3. doc: Added more DITA output to the XML generator Designer: Prevent QButtonGroup from being added for Q3ButtonGroup. Fix for a leak in the mac style. Doc: Fixing bugs to style and script doc: Added more DITA output to the XML generator Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText() Fix compiler warnings in QtGui (text,painting). Allow Unix to generate unique UUIDs if /dev/urandom exists. Allow GNU Free Documentation license header. Add missing license header. Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072 Fix example compile and runtime warnings, webkit examples not built. qgl_cl_p.h is no longer existent Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2 Doc: Fixed documentation errors. doc: Added more DITA output to the XML generator doc: Fixed type of Package::name ...
| | | * | doc: Fixed type of Package::nameThorbjørn Lindeijer2010-06-181-1/+1
| | | |/ | | | | | | | | | | | | Reviewed-by: Alan Alpert
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-221-3/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compiler warnings (unused variables). Compiler warnings. Fix crash with large ClientCutMessage Fix crash at exit and out of bounds write fix issue wrt posted events on Windows CE
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-211-3/+0
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compiler warnings (unused variables). Compiler warnings. Fix crash with large ClientCutMessage Fix crash at exit and out of bounds write fix issue wrt posted events on Windows CE
| | | * | Compiler warnings (unused variables).Bjørn Erik Nilsen2010-06-211-3/+0
| | | |/
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-221-1/+24
|\ \ \ \
| * | | | DocAaron Kennedy2010-06-221-1/+24
| | | | |
* | | | | Handle TextInput inputMethodEvent() properlyMartin Jones2010-06-222-2/+18
|/ / / / | | | | | | | | | | | | | | | | Follow the pattern of other text input classes and QML key handling classes.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-221-1/+1
|\ \ \ \ | |/ / /
| * | | Rename example image fileBea Lam2010-06-221-1/+1
| |/ /
* | | Allow QT_TR_NOOP (as a no-op) in ListModel values.Warwick Allison2010-06-221-4/+9
|/ / | | | | | | Task-number: QTBUG-11403
* | ListView doc improvements and examples clean upBea Lam2010-06-181-12/+25
| |
* | 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-177-48/+83
|\ \ | |/ |/| | | | | | | | | | | | | | | | | * '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
| |\
| | * BorderImage is not updated when border values changeYann Bodson2010-06-173-1/+16
| | | | | | | | | | | | | | | Task-number: QTBUG-11509 Reviewed-by: Michael Brasser
| * | doc: improve Repeater model docs.Martin Jones2010-06-171-10/+3
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-171-4/+5
| |\
| | * Properly update childrenRect for position changes and shrinking.Michael Brasser2010-06-171-4/+5
| | | | | | | | | | | | 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-1 into ↵Qt Continuous Integration System2010-06-171-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Work around ICE in Intel C++ Compiler 11.1.072Thiago Macieira2010-06-161-1/+1
| | | | | | | | | | | | | | | | qml/qdeclarativecompiledbindings.cpp(1141) (col. 11): internal error: 0_1855 Intel reports that this bug has been fixed with release 12 of ICC Reviewed-By: Alan Alpert
* | doc: add note that items with width or height of 0 are not positioned.Martin Jones2010-06-171-0/+8
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-168-16/+68
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-06-161-0/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-161-1/+5
| | |\ \ | | | |/
| | * | Stopping a flick resulted in the next click being consumed.Martin Jones2010-06-161-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-11390
| * | | Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-166-15/+62
| | |/ | |/|
| * | Document section.delegateBea Lam2010-06-161-1/+5
| |/
* | Write TextInput.positionToRectangle docs.Alan Alpert2010-06-162-4/+10
| | | | | | | | | | | | Also renamed the argument to be more accurate. Task-number: QTBUG-11168
* | Fix autoScroll implementationAlan Alpert2010-06-162-35/+54
|/ | | | | | | | | | | The scrolling should not be calculated inside the paint event, this leads to some incorrect behaviour. It is now calculated separately when needed. Patch actually written by Alexis, and I reviewed it. Task-number: QTBUG-11127 Reviewed-by: Alexis Ménard
* Remove duplicated code.Michael Brasser2010-06-152-14/+2
|
* Fix bug with childrenRect resizing on startup.Michael Brasser2010-06-152-19/+16
| | | | | | This also optimizes the implementation. Task-number: QTBUG-11383
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-1254-579/+939
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) ListView.onRemove animation is not played when the list has only one item. Move listview/itemlist.qml to a separate visualitemmodel example Make snapping work properly for highlight ranges > item size Fix test - sizeHint should not change after initial load. Also use Minor doc fixes Doc improvements, including snippet fixes, linking to examples, making Fix qmlviewer test failure on windows Do not keep flush timer running once no pixmaps are detached. Avoid recursive refill() in List/GridView Make snippet compile and pass license test, and add missing snippet file Remove accidentaly added characters. Update on color change. Update on color change. Add go button to webbrowser example. Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and Document attached properties Add 'on' prefix to documentation of signals Stablize qmlviewer test Improve test stability. qmlviewer: ensure that only clicks on the current file list are handled. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-111-0/+2
| |\
| | * Move listview/itemlist.qml to a separate visualitemmodel exampleBea Lam2010-06-111-0/+2
| | |