summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix auto test failure.Andrew den Exter2011-03-311-0/+8
| | | | | | Add test file ommited from b94176e69efc3948696c6774d5a228fc753b5b29. Change-Id: Ia5436974a4941f50c8f1636196372e5b8a90be5f
* Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-314-1/+39
| | | | | | | | | Image sourceSize lacked a RESET method to allow reverting to the natural size of the image. Change-Id: I4e9089d8e16991375745db553f891bd377143eab Task-number: QTBUG-18442 Reviewed-by: Yann Bodson
* Rotation transform with NaN angle can cause crashMartin Jones2011-03-302-1/+7
| | | | | | | | | When used in conjunction with Text resulted in massive memory consunmption. Change-Id: I5e19cb54bcd57b1ea32d17641f976f8288611a9e Task-number: QTBUG-18386 Reviewed-by: Charles Yin
* Canceling image download while reading causes crashMartin Jones2011-03-303-3/+7
| | | | | | | | | | | | | | We were deleting a QObject owned by another thread, which is fine if there are no pending events, but very bad if there are, e.g. queued signals due to downloadProgress() updates. Use deleteLater() which is safe to call in any thread. Also call QDeclarativePixmap::clear(QObject *obj) where appropriate to remove connections and ensure we don't handle any unwanted signals after the download is cancelled. Change-Id: Ia8fb41a8cd004d9840e7cec35915f1afdb03ac4d Task-number: QTBUG-18412 Reviewed-by: Aaron Kennedy
* Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-304-8/+57
| | | | | | | | | | | Remove the padding QLineControl::cursorRect() adds for region updates. QGraphicsView also grew the rectangle by returning the bounding rect of the transformed rectangle which is fixed by using the same transform for QRect as is used for QRectF. Change-Id: I8d8df9dbc6b4250e4e5392871191123a76b304a0 Task-number: QTBUG-18343 Reviewed-by: Martin Jones
* Return correct boundaries reasons from QTextBoundaryFinder.Andrew den Exter2011-03-303-43/+28
| | | | | | | | | | | | | | | The next character after a boundary is at pos, not pos + 1. Also consider whether the previous and next character are whitespace in combination when determing word boudaries otherwise positions between whitespace characters will return both StartWord and EndWord. And since there's no need to look ahead one character don't shortcut` the regular logic for the boundary before the last character. Change-Id: I2efbf3947066767945f96bf8456ef518d2149191 Task-number: QTBUG-11365 Reviewed-by: Denis Dzyubenko Reviewed-by: Ritt Konstantin
* GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| | | | | | | | | Introduced by RTL changes. The list position should only be reset when the view is completely regenerated, e.g. when the orientation changes. Change-Id: I748333529c113d95eaebfb8ac9bb9cf543413d3b Task-number: QTBUG-18441 Reviewed-by: Bea Lam
* Fix text selection with shift-click.Andrew den Exter2011-03-282-1/+13
| | | | | | | | | | Move the cursor when word selection is NOT enabled. If word selection is enabled then then cursor would have been moved in a previous branch, the (incorrectly inverted) check was to prevent that being overridden. Change-Id: I788c3b41c6fdb250d6086893ea98a1aa8c302514 Task-number: QTBUG-18017 Reviewed-by: Alan Alpert
* Fix QUnifiedTimer bugAlan Alpert2011-03-242-1/+8
| | | | | | | | | | | | Pause animations (like Timer) could trigger a jump to the next tick, which meant that other pause animations would have missed the interval skipped by the pause. Change-Id: Idebe4cbe70b2a1536d684288fc1c5d65e4c5df84 Cherry-pick-of: 0f5feed7dc260eabe1c2784a168e0b2fcc85e1d8 Task-number: QTBUG-18126 Reviewed-by: Leo Cunha Reviewed-by: Michael Brasser
* Fix memory leak.Martin Jones2011-03-241-0/+2
| | | | | | Change-Id: I919935399ee1b0e505c85781d481d17345df25c9 Task-number: QT-4330 Reviewed-by: Michael Brasser
* Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-212-2/+20
| | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
* Fix writing to an attached property from script.Michael Brasser2011-03-213-9/+29
| | | | | Change-Id: I80c228092271d4d9c5694607da7a123d06739731 Reviewed-by: Aaron Kennedy
* fixes/improvements for new QML right-to-left docsBea Lam2011-03-2113-108/+152
| | | | Clarify some of the docs and fix some broken doc links.
* Fix license headers in example codeBea Lam2011-03-211-1/+41
| | | | Change-Id: I510caf92c2e33df2bb44d87cc07fe78a0823ab5f
* Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-1822-186/+1412
| | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
* Doc fix - QtQuick 1.1 schedulingBea Lam2011-03-181-1/+1
| | | | Change-Id: If19934bf378e5fbc6cb1dce1df2164905e97f0ed
* PathView doesn't update if preferred highlight range changes.Martin Jones2011-03-173-1/+43
| | | | | | | | Simply call refill() when they change. Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad Task-number: QTBUG-15356 Reviewed-by: Kevin Wu Won
* Image.PreserveAspectFit has unexpected effect on Image's sourceSizeMartin Jones2011-03-174-5/+61
| | | | | | | | | | | The sourceSize should always be the size of the image, unless set otherwise. When calculating the size of an image with Image.PreserveAspectFit set the natural image size should be used for the calculation if no size has been set explicitly. Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69 Task-number: QTBUG-16389 Reviewed-by: Joona Petrell
* Doc improvement for Image.fillMode.Yann Bodson2011-03-171-2/+5
| | | | | Change-Id: I2aec2c9fae07a8551001b2c7d5f5ab8da0fbb7df Task-number: QTBUG-14899
* QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-173-0/+20
| | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
* Re-enable lineHeight tests.Yann Bodson2011-03-171-3/+3
| | | | | | These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
* Qt.include() used in WorkerScript is broken on Windows.Martin Jones2011-03-166-2/+32
| | | | | | | | | The script local filename was used to resolve the source URL rather than the script URL. Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce Task-number: QTBUG-17977 Reviewed-by: Aaron Kennedy
* Disabled non-QDeclarativeItems in Flickable break flickingMartin Jones2011-03-163-3/+52
| | | | | | | | Allow Flickable to steal grab from items that are disabled. Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848 Task-number: QT-4677 Reviewed-by: Michael Brasser
* Border still drawn on Rectangle elements when border.width == 0Martin Jones2011-03-151-2/+2
| | | | | | | | | The _valid flag did not consider both color alpha and line width in both setters. Change-Id: Iba544d65a0a40e36f1e09091e007418c9eefa0cd Task-number: QTBUG-18102 Reviewed-by: Alan Alpert
* Regression: currentIndex was not set correctly after model cleared.Martin Jones2011-03-154-5/+53
| | | | | | | | | | Change b3080d78f2ff2d98410249e09d5d7d6e20fd155c stopped the currentIndex from being updated when a new item is added to an empty view. Change-Id: I77a0789fcf3693034a2d7aca173fec669b913b18 Task-number: QTBUG-18123 Reviewed-by: Bea Lam
* Remove bindings before assigning constants in VMEAaron Kennedy2011-03-155-1/+92
| | | | | Change-Id: I4c246cbcf8d0168cb4af028d6d04088fe20cdbba Task-number: QTBUG-17276
* Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-144-2/+25
| | | | | | | | | If selectByMouse is false don't allow any text selection on mouse move. Change-Id: Ic9f309899bc0de48066a2393e088e15b3a2f06db Task-number: QTBUG-18072 Reviewed-by: Martin Jones
* Update QML "What's New" docs.Martin Jones2011-03-114-7/+43
| | | | Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
* Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-113-2/+21
| | | | | | | | | | | In PasswordEchoOnEdit mode return the display text instead of the real text from inputMethodQuery() when not editing the password and clear old password if new input is received through an input method event. Change-Id: I7f24f510bf8e356e460900c3b9ff55ea16b32ab3 Task-number: QTBUG-17562 Reviewed-by: Joona Petrell
* Fix ListView boundary extents for RTL layout.Martin Jones2011-03-113-9/+182
| | | | | | | | | The delegates were laid out RTL, but the first item was not aligned with the right edge. Also fixes QTBUG-18037. Change-Id: I6387c2f1ad37385376304f8cc76407b34d9fb834 Task-number: QTBUG-16010 Reviewed-by: Joona Petrell
* Fix compiler warning.Andrew den Exter2011-03-111-4/+4
| | | | | | Add parentheses around nested || statment. Change-Id: I836b39b438dea5236d2c45a9920cd8307623df3d
* AnimatedImage does not change progress valueYann Bodson2011-03-102-5/+69
| | | | | | | | | This fixes QTBUG-17964 and make AnimatedImage behave like Image. Task-number: QTBUG-17964 Reviewed-By: Martin Jones Change-Id: I33996353a3b4ee0edb03741998f3ea893d4d31e5
* Fix failing testsBea Lam2011-03-104-0/+14
| | | | | | | | | RTL text-related tests were failing on mac since QApplication::keyboardInputDirection() is not always initialized when the QApplication instance is created. Change-Id: Ifa7214ffb1941d824a9425015b38aa77366381bb Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-qmlKai Koehne2011-03-0963-592/+5069
|\
| * Merge branch 'qtquick11' into 4.7Joona Petrell2011-03-0963-592/+5069
| |\
| | * Add missing header include missing from the previous commitJoona Petrell2011-03-091-0/+1
| | | | | | | | | | | | Change-Id: I7993c13c7fe43027caaa28ef3866df5f0d21f5b9
| | * Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-096-22/+115
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
| | * Revert to previous lineHeight behavior.Martin Jones2011-03-092-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the Text to not include the extra spacing at the end of the block. This is different to what QDextDocument does. Revert back to the old behavior. Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3 Reviewed-by: Joona Petrell
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-03-083-5/+59
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp Change-Id: Iddfc48e643a7f043afa1c5d5f1777f645a39548e
| | * | Use the text layout bounds calculated by QLayout.Martin Jones2011-03-083-49/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to calculate the size and position of the cache image ourselves. Rather use the line positions and bounding rect calculated by QLayout. Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8 Reviewed-by: Joona Petrell
| | * | Fix TextInput key navigation for RTL textJoona Petrell2011-03-082-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15882 Reviewed-by: Martin Jones Change-Id: I77c02de3bcd1a1d05dfcdd71327da45182050071
| | * | Base empty QML editor horizontal alignment on ↵Joona Petrell2011-03-086-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QApplication::keyboardInputDirection() Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
| | * | Merge branch '4.7' into qtquick11Joona Petrell2011-03-084-0/+78
| | |\ \
| | * | | Include dynamic parenting use cases in layout mirroring autotestsJoona Petrell2011-03-082-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17280 Reviewed-by: Martin Jones Change-Id: Ibbbd2da44d5826b6e499b731eda66b2016bade85
| | * | | PinchArea example produced incorrect scaling.Martin Jones2011-03-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maths was dodgy - producing far greater scaling than that provided by PinchArea. Change-Id: I4a1ee1b0d65eed623ec9ee92c22c9740116430c5 Task-number: QTBUG-17828 Reviewed-by: Michael Brasser
| | * | | Fix documentation talking about old property LayoutMirror::mirrorJoona Petrell2011-03-073-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Bea Lam Change-Id: I3f842b7672ee57dadbd1ed9216249c36aa527d6a
| | * | | Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-0712-85/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
| | * | | Update QtDeclarative def filesJoona Petrell2011-03-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols introduced in Qt Quick 1.1 layout mirroring support. Task-number: QTBUG-17280 Reviewed-by: Martin Jones
| | * | | Removal of text alignment layout direction dependency was missing couple of ↵Joona Petrell2011-03-043-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
| | * | | Fix RTL multiline Text drawingMartin Jones2011-03-042-61/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We handled horizontal alignment ourselves, but this neglected some RTL layouting issues (e.g. trailing spaces). Allow QTextLayout to do the aligning for us. Also fix eliding of multiline text for RTL language - in this case the eliding should be to the left. Change-Id: I487137b123ae66c1f5fc358a8d8a013049d05818 Reviewed-by: Joona Petrell