aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
Commit message (Collapse)AuthorAgeFilesLines
* Update qmltypes filesAlan Alpert2014-05-061-1/+1
| | | | | | | | | | | | | Additionally, fixes some revisioning errors which a manual inspection of the qmltypes files diffs revealed. -mipmapChanged signal is new -windowTitleChanged signal is new -Matrix4x4 made 5.3, but was revisioned for 5.4 Task-number: QTBUG-29806 Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix translations in states causing failing assertionsSimon Hausmann2014-04-282-0/+32
| | | | | | | | | | | | | This is a smaller fix suitable for the release branch, merely adding support for translations to the bytearray compilation step for states and ensuring a consistent error message when qsTr is used in list models. The proper fix will be done in dev that eliminates the entire intermediate QByteArray storage for custom compilers. Task-number: QTBUG-38492 Change-Id: If5171f16eb742c718e48b8bbcb265b0c241cd5e7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Follow QOpenGLContext API renamingLaszlo Agocs2014-04-251-1/+1
| | | | | | Task-number: QTBUG-38564 Change-Id: Ice1170339f7d650fcb6accfccf325471629343d6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* If a popup window is opened, do not change the focusShawn Rutledge2014-04-222-2/+3
| | | | | | | | | | | | | It's not working to have QQuickWindow lose focus every time a menu is opened. This doesn't happen on OSX because menus are implemented as special native ones, but on X11 a menu is another window. In QtQuick Controls it's useful for copy/cut/paste Actions to be enabled based on whether some text has focus. Change-Id: I092b46133b9a8a44639ad9d89ee2bdfe30206bd9 Task-number: QTBUG-36292 Task-number: QTBUG-36332 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Mark tst_qquicktextinput as insignificant on Mac OS XSimon Hausmann2014-04-151-0/+2
| | | | | | | This will allow further integrations until QTBUG-38363 is fixed. Change-Id: I277628c55b893d199bd1886ee6eb9ff466860a05 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Avoid event propagation with Keys.forwardToJ-P Nurmi2014-04-122-0/+157
| | | | | | | | | | | | | | | | [ChangeLog][QtQuick][Important Behavior Changes] Keys.forwardTo no longer propagates key events to the target item's parents. This makes Keys.forwardTo act more as expected, like an event filter. This way Keys.forwardTo becomes usable for composite types that want to enable the Keys attached property handling by forwarding key events from an internal editor. Task-number: QTBUG-37924 Change-Id: I66d1b7245df39678767e79d4bdd46fc15e5c5c3f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix the initial value of XmlListModel::countJ-P Nurmi2014-04-102-0/+33
| | | | | | | | | QAbstractItemModel::rowCount() should under no circumstances return -1 or it will crash QSortFilterProxyModel. Change-Id: Ib3d4a57d5fc3761a7fc6f6925c3d25bdea20ce78 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* ListView: fix rounding errorsJ-P Nurmi2014-04-092-0/+190
| | | | | | | Task-number: QTBUG-37339 Change-Id: I223e4d6bcabb1daa705c0ed2212e7e2b2fc3f37c Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Verify empty SmoothedAnimation doesn't keep animation system running.Michael Brasser2014-04-081-0/+22
| | | | | Change-Id: I8f8a9d31241e1bff9e72524b69d625258885558a Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* OSX: fix QQuickListView testShawn Rutledge2014-04-073-13/+16
| | | | | | | | | | | outsideViewportChangeNotAffectingView was failing on OSX. Make the window larger; flick a longer distance in the same time to ensure that the flick takes the list to the end. Task-number: QTBUG-37828 Task-number: QTBUG-27740 Change-Id: Iefa44942a8f8318861781db820e830b459114a83 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* On Mac only editable text input should receive tab focusLiang Qi2014-04-022-0/+186
| | | | | | | | | | | | | | | It's for all items with "readOnly: false" and has "text" property. [ChangeLog][QtQuick] Mac: any editable text input will get tab focus when "Text boxes and lists only" option was selected. About "Text boxes and lists only", see commit 06332df7438c8d2215b02f1e01ce2ed28a49a320. Task-number: QTBUG-38004 Change-Id: I73947b71b2fec69a66e122514d440656f4650e99 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix visual parent ownership with scenes that create windowsSimon Hausmann2014-03-282-0/+73
| | | | | | | | | | | | | | | | | | Commit 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e introduced the concept that a visual parent marks its children, by recursively marking the children of the root item in a QQuickView. This allowed for the removal of an ugly hack in QtQuick Controls. Unfortunately that fix is incomplete in the sense that it makes the incorrect assumption that a QQuickView is always used. The use-case in the bug report is to have child items inside a QtQuick.Window (a regular ApplicationWindow in fact). That window - implemented by QQuickWindowQmlImpl - also needs to mark its children, so this patch introduces the use of the same GC marking helper class (which now operates on a QQuickWindow instead of a QQuickViewPrivate). Task-number: QTBUG-37711 Change-Id: Id788e84dbb041ac8ba6ff23dc4ef56f6fe9e465a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Implement high-dpi "@2x" image handling.Morten Johan Sørvig2014-03-202-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | Make QQuickBaseImage::load() load "@2x" image files on high-dpi displays. Reload images on screen change in order to load the correct version depending on screen dpi. Modify QQuickImageBase::updatePaintNode() to work with @2x images. QQuickBaseImage::load() now looks at the target window's devicePixelRatio and checks for the presence of a "@2x" file on disk. If found the @2x version will be used. Unlike QPixmap, QQuickPixmap has no special knowledge of "@2x" files. They pixmap system will be asked to load "@2x" files and will cache them and report the (device) pixel size, like any other pixmap. Add auto-test and manual test. Task-number: QTBUG-32862, QTBUG-33069 Change-Id: I1f57a10075e499f6eee61df5421e1986521c6ab0 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Behavior fix when creating QML windowsFabian Bumberger2014-03-194-3/+97
| | | | | | | | | | | | | | | | | | | | When a QML window is created it is set visible after the QQuickWindowQmlImpl component is complete. This works fine for a single window, but because componentCompleted is called first for the last created windows, the behavior is not as the user might expect (and different compared to version 2.0 of the QML Window API). One of the results is e.g. that a window which is created as a child object in QML will have a lower z-Order than the parent. On some platforms (e.g. BlackBerry) an even bigger problem arises because the first created window acts as a container for the whole application and is always shown fullscreen. On other platforms (Linux) the initial window position and the window focus ares not set correctly. This patch postpones showing windows until the "transientParent" is visible. [Changelog][QtQuick] Making a QtQuick Window visible is postponed till its transient parent is visible Task-number: QTBUG-37440 Change-Id: I09a94ff038c066a5d3298c6c103dafde50bef1fa Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Invalidate all batches potentially affected by a change.Gunnar Sletta2014-03-192-0/+104
| | | | | | | | | | | | When two separate changes have occurred, we need to not only invalidate the batches directly overlapping those, but also any batch which has render orders between the two. So, keep track of the range of invalidated render orders and invalidate everything in between. Task-number: QTBUG-37422 Change-Id: Ie5a289d5c569b84917ec9ac52671173c566e69b3 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Dynamic GL in QuickLaszlo Agocs2014-03-181-2/+3
| | | | | | | | | | The counterpart to I716fdebb. Implements the dynamic path in scenegraph. Task-number: QTBUG-36483 Change-Id: I2dc613ba84560b7b8e36d3cd1da61c050ab08db0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Item views: improve initial Z-value handlingJ-P Nurmi2014-03-189-45/+299
| | | | | | | | | | Respect the initial Z-values of item, highlight, header, footer and section delegate instances. Mention also the default values in docs. Change-Id: I2ce4bb537898a0f5fdfa776b79d5747b1c080a7b Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Stabilize tst_qquickwindow and tst_scenegraph.Gunnar Sletta2014-03-172-3/+39
| | | | | Change-Id: I6f1b6c0ed86869149658e3ce07545217ce9797a7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Canvas: do not emit paint when resized but hiddenJ-P Nurmi2014-03-162-13/+20
| | | | | | | | | | | | | | | It turns out to be a bad idea (as in, breaks the enterprise controls) to block paint() altogether when hidden. The original bug report QTBUG-31830 only complained about paint() being emitted upon resize while _hidden_, so this change solves exactly that. User is still free to call requestPaint() even when hidden, and Canvas now doesn't recklessly ignore the request. Task-number: QTBUG-31830 Change-Id: Icd82188f65406b3ef6ae3b19b5984944576886ff Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Don't crash if a ScriptAction changes state mid-transition.Michael Brasser2014-03-132-0/+87
| | | | | Change-Id: Ia85cb128c7410e2276bf4da02f946d3d0bf44989 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Ensure TextEdit's text is vertically aligned after resizing its height.Mitch Curtis2014-03-131-0/+13
| | | | | | | | | | | | | The current code only updates the alignment if the width of the TextEdit changed, but we must also check if the height has changed. Task-number: QTBUG-36069 [ChangeLog][QtQuick][TextEdit] Fixed TextEdit not vertically aligning its text after having its height changed. Change-Id: I0b2d6a7384457ca1018fc9899c82699e8ecfcbd4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Item views: avoid fixing up the position while moving/flickingJ-P Nurmi2014-03-132-0/+43
| | | | | | Task-number: QTBUG-35920 Change-Id: Id6a68400eed69d880dd1c218ec4a1beda8a8fbb9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* MultiPointTouchArea: make nested.qml autotest easier to debugShawn Rutledge2014-03-101-5/+54
| | | | | | | Visual feedback Change-Id: I8f670d5f4729149e5ee02c2e9a36b5570ac3c5a7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix TextEdit::lineCount to update as appropriateJ-P Nurmi2014-03-101-0/+51
| | | | | | | | | | The total line count needs to be updated when geometry, document size or wrapping mode changes. Task-number: QTBUG-37263 Change-Id: If58a2f77022475e8bcb7cca0f2a091ee837b39a5 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* MultiPointTouchArea: handles mouse too, unless mouseEnabled is falseShawn Rutledge2014-03-104-0/+438
| | | | | | | | | | | | | | | | | | | A new boolean property mouseEnabled is introduced (true by default). If set to true, then it will handle any non-synthetic mouse event as if it were a touch point. If set to false, the area becomes transparent for real mouse events so that a MultiPointTouchArea can be stacked on top of a MouseArea in order to separate handling of touch and mouse. In either case it continues to absorb and ignore synthesized mouse events (including touch-to-mouse synthesis in QQuickWindow). [ChangeLog][QtQuick][MultiPointTouchArea]handles mouse as a touchpoint; added mouseEnabled property to permit transparent pass-through to mouse-sensitive items Change-Id: I4af94d838f0060154494589c0f15c6858ee89ddb Task-number: QTBUG-31047 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Stabilize tst_QQuickPathView:dataModel()J-P Nurmi2014-03-062-5/+4
| | | | | | | | | | | | | | | - QQuickPathView::setCurrentIndex() result must be immediate => no need for random QTest::qWait(100) there. - Remove another random QTest::qWait(100) after inserting a model item. Instead, wait for the desired result ie. delegate creation with QTRY_VERIFY(). - Furthermore, disable the default highlight move duration to avoid the auto test and QQuickPathView's internal timeline fighting over the current index. Task-number: QTBUG-35705 Change-Id: Ie53fdcc8f7955a03027da38b075e6042a3aea7f2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-036-8/+8
| | | | | | Change-Id: I9856c110399c4b6b1ea6aba2d92392cecff04656 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add a column to the default method error messageSimon Hausmann2014-03-021-1/+1
| | | | | | | | This brings both compilers in sync by reporting line and column if doing a signal object assignment without a default method. Change-Id: I8b1bf90c4ce3cd7b117ad7eecdbfe319b07b1191 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QQuickWindow: fix content item sizeJ-P Nurmi2014-02-281-0/+34
| | | | | | | | | | | | | | | | | | | | Resize content item in QQuickWindow::resizeEvent() instead of using signals and slots. The signal-slot connections were only established when child items were added in QML. It should work in C++ too, since QQuickWindow and QQuickItem are part of the public C++ API and using them in C++ is a perfectly valid use case. Resizing the content item in resizeEvent() is not only faster than using signals and slots, but also in theory a bit more flexible as one would be able to override the event handler and implement their own layouting. Task-number: QTBUG-36938 Change-Id: Id05d4cf6d547021803050633e6f0a3359129a9f3 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix tst_qquicktext::hover()J-P Nurmi2014-02-281-0/+2
| | | | | | Task-number: QTBUG-36938 Change-Id: I28da25235ae7b8805ebc474777a5edd43ceef941 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Canvas: do not emit paint signal when invisibleJ-P Nurmi2014-02-282-3/+14
| | | | | | | Task-number: QTBUG-31830 Change-Id: I23c6fc822547120f14c2d9a09f01a8f985745e2a Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Revert "Fix item polishing"J-P Nurmi2014-02-283-75/+3
| | | | | | | | | | | | | | | | | | This caused items like positioners and itemviews to not relayout or update as appropriate when items were hidden, and therefore caused problems all over in eg. controls. This reverts commits - 43f983350a548b1b663ea07a0e87e4cc58834214 - 01e609e9fa0ca1317e0f4eff4802a79584450357 - 439f31f128e70ecae16544ee7041695c60e0b2d6 Task-number: QTBUG-36954 Task-number: QTBUG-36934 Task-number: QTBUG-31830 Change-Id: If04cdce51206568c360a45e24efc0bd04764750b Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Mark tst_qquickpathview insignificant on OS XJ-P Nurmi2014-02-271-0/+2
| | | | | | Task-number: QTBUG-27740 Change-Id: I0dbf74b9fb8a4e7542d9d5b3c4f1d0516b04cd36 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Make GridView/ListView attached "view" property available to all delegate typesNils Jeisecke2014-02-264-0/+222
| | | | | | | | | | | | | | | This is useful for accessing the view (e.g. "width", "cellWidth", ... properties) from within section (ListView only), header, footer and highlight delegate components. A typical usecase are components that are used in multiple views and therefore cannot use the views's id for access. The only attached property valid for those non-item delegates is "view". This has been added to the documentation. Change-Id: I33d976da778be23ed531a3b193ceee95ed9800d2 Task-number: QTBUG-32836 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* tst_qquickpathview: show window before flickingShawn Rutledge2014-02-251-0/+5
| | | | | | | | | | It's uncertain whether this caused any actual CI failures, but other tests show the window first, and this one tests interactive functionality so it makes sense that it should be visible. Change-Id: I92c26ce596f556765917409ca4e9037bdaccfa23 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Introduced a few more signals to QQuickWindow.Gunnar Sletta2014-02-251-3/+38
| | | | | | | | | | | | Also marked the new afterAnimation() signal as \since 5.3 and introduced proper revisioning on the new signals. [Changelog][QtQuick] Added QQuickWindow::afterSynchronizing(), openglContextCreated(), sceneGraphAboutToStop(). Useful for deeper integration with the rendering. Change-Id: I5532b310506c2432325595e55ef9307b8934abee Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Update QQuickTextInput's baselineOffset when only height changesJan Arve Saether2014-02-221-6/+19
| | | | | | | Task-number: QTBUG-36529 Change-Id: I2cd577013c4965e76c9350abaebb9b7a6e4e0270 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* QQuickTimeLine: add missing time checksJ-P Nurmi2014-02-213-0/+77
| | | | | | | | | | | | The same check is done in QQuickTimeLine::pause(), move() and moveBy(), where the time is passed as an argument. QQuickTimeLine::accel() and accelDistance() calculate the time based on velocity and acceleration or distance. With tiny values this calculation can result to a negative time due to integer overflow. Task-number: QTBUG-35046 Change-Id: I000e73d3f787375946e8f87a5d24153ae919bc8d Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Make sure we update filtering options on atlas textures.Gunnar Sletta2014-02-214-1/+76
| | | | | | | | | | | We had had an optimization which tried to reduce state changes, but filtering is also changed in QSGTexture::updateBindOptions which Atlas::bind() didn't know anything about. Solution: don't try to be so clever. Task-number: QTBUG-35457 Change-Id: I39ac0106396921e1b652db2b2aa5a9923b35e825 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix item polishingJ-P Nurmi2014-02-201-0/+61
| | | | | | | | | | | | | | | | | After "Dont call updatePolish if an item is not visible" (439f31f) and "Fix polishItems bug" (01e609e), desktop style animations for QtQuick Controls were no longer running. This was because QQuickItem::polish() no longer polished a _visible_ item when there were other _hidden_ items in the queue to be polished. This change restores the old logic that QQuickWindow only keeps track of visible items to be polished, whilst the idea of hidden items not being polished still remains valid. QQuickItem is made responsible for polishing itself if necessary when it becomes visible. Task-number: QTBUG-36934 Change-Id: I4d48d3a3e2c841d337cd52ec4fd27092f84a8626 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Add a signal for syncing external animation systemsLaszlo Agocs2014-02-201-0/+15
| | | | | | | | | [ChangeLog] QQuickWindow will now emit the afterAnimating() signal from the gui thread before each scenegraph sync request. Change-Id: I4897c82f75066238e781455d4fce4fb6bbe2558e Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Ensure Behavior stops animating when a new value is set while disabled.Michael Brasser2014-02-203-0/+115
| | | | | | | | | | | | | | Otherwise the Behavior could cause the property value to end up in an unwanted and inconsistent state. For example, in the following case: x: myXValue Behavior on x { NumberAnimation {} } x could end up *not equal* to myXValue if myXValue was changed while the Behavior was still animating but currently disabled. Change-Id: I3826fdc3f48b2722e778638b116546db7e831e87 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-181-0/+7
|\ | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4functionobject.cpp src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753
| * Disable Flickable tests on Mac OS X.Jani Heikkinen2014-02-131-0/+1
| | | | | | | | | | | | Task-number: QTBUG-36804 Change-Id: I6bff9360d785bd7496131e3b56a24b11871257fe Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Expose Qt Quick gradient conversion code privately.Mitch Curtis2014-02-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rectangle is currently the only item that supports gradients, but other items have been introduced (within Qt Quick Enterprise Controls) which need QQuickGradient => QLinearGradient conversion, and it doesn't make sense to duplicate the gradient stop conversion code. The QQuickGradient and QQuickGradientStop classes need to be privately exported so that modules that use private Qt API can use the classes with quick-private. Change-Id: I8b130ff5384d9481d3f29510b3de61f7d8f775e2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-02-125-14/+53
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-115-14/+53
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/qml/jsruntime/qv4arrayobject.cpp src/qml/jsruntime/qv4context.cpp Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
| | * Fix memory leak in testFrederik Gladhorn2014-02-111-2/+2
| | | | | | | | | | | | | | | Change-Id: I026ce85a6e593d5eccecdf032ee2f0763a2bef87 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| | * Fix origin for short reversed item viewsJohn Brooks2014-02-101-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reversed (BottomToTop and RightToLeft) item views would report an impossible positive value for origin when contentHeight < height. The correct value will be effectively equivalent to the position of the footer, and always negative. Match other logic using lastPosition() by negating its value for reversed views. This fixes a bug with content disappearing in a Controls ScrollView on a BottomToTop view. Change-Id: Ieedbb64ce8fc7c0fb36e5256e437ddeb3e757761 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
| | * Revert "Skip unstable test"Liang Qi2014-02-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8e0c5b59f57b51a0dc80d3d8274202776c6e03df. This test doesn't fail any more. Task-number: QTBUG-23976 Change-Id: I77704e7811c4c335cb5836ba7645a8804c13e12d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>