aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-113-9/+10
|\ | | | | | | Change-Id: I6e6f2ed367f89bab2114025478c873cfb132fe02
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-213-9/+10
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | QQuickItemView: Add guard before returning currentItem itemCaroline Chao2013-03-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | And don't check if the currentItem is empty before calling applyPendingChanges(). And an autotest. (Patch from Steffen Imhof) Task-number: QTBUG-30227 Change-Id: Ia16362a6d0dce771f20772929c32e9306ed0e0f9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-03-191-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced by https://codereview.qt-project.org/48690 whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Reverting the dragStartOffset portion of that change fixes the regression. That same change was also resposible for the property update regression https://codereview.qt-project.org/49768 attempted to fix. That change is also reverted as it was unnecessary and may have introduced some regressions of its own. Task-number: QTBUG-30032 Change-Id: I7723b459cc5a6a0731893aeb6332d00cad1bd79b Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | Calculate drag distance relative to the mouse position when a drag is detected rather than the press position so there isn't a large change in position on the first move. Task-number: QTBUG-30188 Change-Id: I5c2269c2228668a3842e18f65167637497b3beb4 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
* | Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | In automated GUI test scenarios it often desired not to wait for animations before verifying a result, so setting the duration to zero should accomplish this, before this patch; if duration was set to zero QSmoothedAnimation would treat it as if duration was not set, and used velocity to calculate animation speed. Change-Id: Ia57f1c9ffdd2056ac7c85d1cb94dbd3835fcbb7a Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | Fixed text opacity when using Text.NativeRendering.Yoann Lopes2013-03-121-1/+1
| | | | | | | | | | Change-Id: I76922074c02c368f8a8a6998c478a33537e9a6e8 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Improve the ordering of Flickable dragging and moving property updates.Andrew den Exter2013-03-121-4/+15
| | | | | | | | | | | | | | | | | | | | Move the contentItem after the dragging and moving properties have been updated so they return the correct values from the onContentYChanged and onContentXChanged handlers. Task-number: QTBUG-30032 Change-Id: I15716dc8eee4d9836f96362a8b49f1d0c404b0c2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Simplify function with early return.Frederik Gladhorn2013-03-111-30/+31
| | | | | | | | | | | | Change-Id: Ic0e1a32f6c586e75fb7389ef8009e56881942cf1 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Fix TextEdit::persistentSelection docs (false by default)J-P Nurmi2013-03-011-1/+1
| | | | | | | | | | Change-Id: I3576e08b2bf159250a163466f1402952c7520e8b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | GridView: fix resetColumns() to calculate the amount of columns rightJ-P Nurmi2013-02-261-1/+1
| | | | | | | | | | | | Task-number: QTBUG-29822 Change-Id: I3649398f3d283bc2781daa6b3071538414653e6d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix headers without Qt module directory name in their includesJosh Faust2013-02-254-5/+5
| | | | | | | | | | | | | | | | | | | | Fixed headers to include the Qt module directory in their #include directives, e.g. <QtCore/QObject> instead of <QObject>. QTBUG-29797 Change-Id: I6f61973deb4e48158d3eff896afd81ca4b8ae960 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix warnings about shadowing membersThiago Macieira2013-02-222-4/+4
| | | | | | | | | | | | | | | | util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow] [and others] Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | ListView's highlightMoveDuration should default to -1.Michael Brasser2013-02-221-1/+3
| | | | | | | | | | Change-Id: Ibb53cc21b4f1f301569cd7724c60cb8df978921a Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
* | Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-221-26/+21
| | | | | | | | | | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. Task-number: QTBUG-29718 Change-Id: I3a1be4ed0132b91dca2fb0387ecefd39275a52da Reviewed-by: Alan Alpert <aalpert@rim.com>
* | MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-221-30/+19
| | | | | | | | | | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. Task-number: 29717 Change-Id: I24016994f6cf9116382ef7faeb50b10e5716e10e Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Typos: tripple->tripleFrederik Gladhorn2013-02-212-21/+21
|/ | | | | | | This enables grepping. Change-Id: Ibf85800b998a02645c50b1b84d42088d16091378 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Fix QQuickTimeLine::accel() & accelDistance()J-P Nurmi2013-02-201-3/+4
| | | | | | | | | | Do not compare real numbers (velocities, accelerations and distances) to 0.0f, but use qFuzzyIsNull() and qIsNaN(). Task-number: QTBUG-29144 Change-Id: I8fe7ebfbc9f665fa2507e66344d081ef2f43b181 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Docs: Slow Down Animations only exists in qml1Frederik Gladhorn2013-02-191-8/+0
| | | | | | | The functionality was part of qmlviewer. Change-Id: Iaf2e19acf54e6773e2b79659f4dc51b92de91dd4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix embedding images in text elementsEskil Abrahamsen Blomfeldt2013-02-191-0/+1
| | | | | | | | | | | It seems that the the inner target rect has either been added recently or its default has been changed to something invalid, because we need to set it to the same as targetRect for the image to show up at all. Task-number: QTBUG-29560 Change-Id: I0fe6b7c5ab07afc780b8ea33a7ccc210861e0821 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Update QtQuickTest documentationCaroline Chao2013-02-181-0/+28
| | | | | | | | | | Add some information about -input, -functions and -help command-line options. Add some examples on how to run a single file and a single function for a QtQuickTest based test. Change-Id: Icd5f92bf8541aa412e2cd18d82dec16a85fe78c9 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Doc: Correcting typo "without with"Marcel Krems2013-02-181-1/+1
| | | | | Change-Id: Ibacbb9aefe9a333994014aec17a0079477a4618f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix missing TextInput::remove(int start, int end) docsJ-P Nurmi2013-02-151-1/+1
| | | | | Change-Id: I0c98e713d53391a191435e5c17b58becddf6d451 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-152-5/+9
| | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* A MouseArea should not receive move or release events if the press was not ↵Michael Brasser2013-02-141-1/+1
| | | | | | | accepted. Change-Id: If70650d7150b224f4460697a953611dd37d57af1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* DesignerSupport: Fix rendering in designer for if new items are addedMarco Bubke2013-02-121-0/+1
| | | | | | | | | The SG nodes are exchanged if the hierarchy the Qml hierarchy is changed. So the SG root node should be always updated for every rendering. Task-number: QTCREATORBUG-8699 Change-Id: I069142e4c5fc65efc3485017fa000ed7e8f2b350 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove use of QPainter::HighQualityAntialiasing. It has no effect.Gunnar Sletta2013-02-122-4/+3
| | | | | Change-Id: I7e1d07a9f34d6edf9dbe3449d34636f700218532 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Doc: Removed reference to QAbstractItemModel::setRoleNames()Venugopal Shivashankar2013-02-081-17/+25
| | | | | | | | | This function is deprecated and it is recommended to reimplement QAbstractItemModel::roleNames() instead. Task-number: QTBUG-29456 Change-Id: Ib28759fe2349edd32a1b87bac04eb44d625d3e60 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed Canvas ImageData pixel values not being settable to 0.Samuel Rødal2013-02-071-1/+1
| | | | | | | | | | | | Someone probably figured "since the data is all initialized to 0 to begin with, we can skip 0 values". However, it's possible to temporarily set a value to other than 0 and then back to 0, a fully valid use case that we need to support. Task-number: QTBUG-29065 Change-Id: Ia9f0803743d696ca8b9cca89c666ccba80a3abd0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix lupdate-warnings.Friedemann Kleint2013-02-061-1/+1
| | | | | | | | | qqmlcomponent.cpp:667: Cannot invoke tr() like this qqmltypeloader.cpp:2292: Cannot invoke tr() like this qquickloader.cpp:944: Cannot invoke tr() like this Change-Id: Ifdd1a7b958b6af88f251e7df27eb4d4018301914 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Ensure the cursorRectangle is updated as the width of the text changes.Andrew den Exter2013-02-011-1/+3
| | | | | | | | | | Outside of when of a monospace font is used, if the text changes the visual position of the cursor will have most likely changed as well even when the cursor index hasn't. Task-number: QTBUG-28677 Change-Id: If8077772d8541a677d5875976e6cd9fc453731df Reviewed-by: Alan Alpert <aalpert@rim.com>
* Merge branch 'release' into stableSergio Ahumada2013-01-313-3/+3
|\ | | | | | | Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
| * Doc: declarative-colors.png not visible in qmltypereference.qdocv5.0.1Nico Vertriest2013-01-281-0/+0
| | | | | | | | | | | | | | | | Copied the file from qml image dir to quick image dir Task-number: QTBUG-29101 Change-Id: Iae64763bc38e135a0dbff8566cf540a309e4c42f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Add QML Types to table of contents in AssistantTopi Reinio2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace 'headerfile' with 'qmlclass' in qdocconf file. As a positive side-effect, QDoc will also add files for 'All members' for QML Types into .qhp as well. Task-number: QTBUG-29226 Change-Id: I282ef42283ec147ea0f2b466b15e7f104c8a012a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Remove outdated macro usageChristian Stenger2013-01-241-2/+2
| | | | | | | | | | | | Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Doc: Fixed "QML Types" node in AssistantJerome Pasion2013-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | Removed "class" from the "selectors" variable in qdocconf file. Task-number: QTBUG-29242 Change-Id: I960dcbdb22358e033177b0ccb9c211136c0e4dcb Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Document QQuickItem::itemChange and QQuickItem::window() properlyGunnar Sletta2013-01-311-3/+87
| | | | | | | | | | Change-Id: Ic0e50ae8760c0c3050db3a095b0fa86679a0c010 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Fix unterminated commentSze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | Change-Id: Ic5bcbac339588fdded265a00515f768058d73870 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Fix "Command '\li' outside of '\list' and '\table'"Sze Howe Koh2013-01-281-1/+1
| | | | | | | | | | | | | | | | It doesn't look like any list is meant to be here. All other instances of "down" are italicized in this document, so we follow suit. Change-Id: I2f0c55dba2025b4eef81248a5f650ebaaaa5bb3a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Prevent possible leak with texture providers.Michael Brasser2013-01-251-0/+2
| | | | | | | | | | | | | | | | If the job has been cancelled, ensure we clean up the texture factory that was created. Change-Id: I0a6e4a23732e6041084ddc483d701a25befd91c9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Ungrab mouse when FocusAboutToChange instead of LeaveFrederik Gladhorn2013-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7b2e2117162594a2d0234bb02408f5b5a446488b introduced a regression in mouse handling: When moving the mouse out of the window it would cancel all further mouse events. That is actually not wanted (eg scroll bars). Instead ungrab the mouse when the focus changes, that means the mouse handling with popups works and the scrollbar use case is also fixed. All the tests related to this seem quite timing sensitive, so try some more QTRY_VERIFY. Remove the parallel_test so that more cpu time will actually let the tests pass more reliably. Change-Id: I90586b05f461d3762728a466d71bcb967e03d14b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Doc: Fix uses of \sinceDebao Zhang2013-01-241-2/+2
| | | | | | | | | | | | Change-Id: Idf497424279fbee08e6e5750e6a15372c808105f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix alignment of Text element with implicit sizeEskil Abrahamsen Blomfeldt2013-01-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | In change e1d6b323d474acc5cd70fd9a0b283326316f55a0 there's an optimization which disables layouts on the QTextDocument, but the layout has to be re-enabled before we can call idealWidth() since this will be zero as long as the page size is 0x0. We simply set the page size to undefined again before calling idealWidth. Task-number: QTBUG-29262 Change-Id: I6bebe7be4c99fce0de8fc4178b5e1abc81abbe87 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Disconnect from previous loading image when loading a new image.Michael Brasser2013-01-241-0/+1
| | | | | | | | | | Change-Id: If2fa95d9715a55d3f07ecf5f232e4f4b9a44a6fb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Make HTML horizontal alignment work like in QtQuick 1Eskil Abrahamsen Blomfeldt2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | If the text width set is higher than the ideal width, there's no risk of wrapping, and thus we align the text based on the full width of the Text element. This matches the behavior in Qt Quick 1.1. Task-number: QTBUG-29262 Change-Id: Ib191e3dd9d17e3bea63ca7825708f53768960e26 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | QQuickImageProvider: fixed three \snippet pathsXingtao Zhang2013-01-211-3/+3
| | | | | | | | | | | | | | Change-Id: I289e61c7e3acc3d7047b2b26fae624900e076586 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix crash in PathViewTasuku Suzuki2013-01-181-3/+7
| | | | | | | | | | | | Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Merge "Merge branch 'release' into stable" into refs/staging/stableGunnar Sletta2013-01-177-7/+7
|\ \
| * | Merge branch 'release' into stableGunnar Sletta2013-01-177-7/+7
| |\| | | | | | | | | | Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 02:50:07 +0000