aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/imagine
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-101-3/+3
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
| * Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Remove support for GPU_BLACKLIST files from some testsEdward Welbourne2018-10-121-1/+0
|/ | | | | | | The feature is no longer used and support for it shall soon be dropped. Change-Id: I9b35b43262b6f07609cf931315125e91e0a1f9b6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* SwipeDelegate: grab the mouse when accepting a press eventShawn Rutledge2017-08-251-20/+0
| | | | | | | | | | | | | | | | | | | | | After 1f4bfc099b7e48e2cc3dd9488b7b42a96122b299 in qtdeclarative, QQuickWindow does not cause the Item to which it's about to attempt to deliver an event to pre-grab. (That caused a lot of thrashing of the grabber, so not doing that is a nice simplification, and also avoids the need to ungrab later, and also makes mouse event handling more like touch event handling.) So whenever SwipeDelegate knows at the time of mouse press that it wants to see the release too, it should grab. The grabber can be either the Item for which it's filtering events, or the SwipeDelegate itself, whichever is more appropriate in any given scenario. For now I assume it should be the delivery-target Item, because that's what would have had the grab before. Task-number: QTBUG-62412 Task-number: QTBUG-62631 Change-Id: Ie01276508c6602b10f9d7996a748ffe90efa36b5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* skip tst_dialog::reject() instead of blacklisting itMitch Curtis2017-08-221-4/+0
| | | | | | | | | | | | Running this test causes tests after it to fail, mainly those related to hover. Since we need to fix the root cause of the recent failures before the release, it shouldn’t matter too much that this test isn’t run for a bit. Task-number: QTBUG-62549 Change-Id: Id8fd00e9049890ae47504c3e4b4ea3dda8ac60ef Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* tst_dialog: blacklist test_reject()Mitch Curtis2017-08-191-0/+4
| | | | | | | | | | | | This test started failing after the recent wip/pointerhandler to dev merge in declarative. Until a fix can be found, we'll blacklist the test so that integration isn't blocked. The issue will need to be fixed before the release. Task-number: QTBUG-62549 Change-Id: Ib72c39ca74c69cf33bd995f9572bf4a9a5b2f680 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* tst_swipedelegate: blacklist failing testsMitch Curtis2017-08-191-0/+20
| | | | | | | | | | | | Some tests started failing after the recent wip/pointerhandler to dev merge in declarative. Until a fix can be found, we'll blacklist the tests so that integration isn't blocked. The issues will need to be fixed before the release. Task-number: QTBUG-62412 Change-Id: Idfa887f979c946311136a4ee1438ee2921267214 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add Imagine styleJ-P Nurmi2017-07-313-0/+68
The Imagine style is based on image assets. The style comes with a default set of images, but the images can be easily changed by providing a directory with images using a predefined naming convention. [ChangeLog][Controls] Added the Imagine style, which is based on image assets that can be provided using a predefined naming convention. Task-number: QTPM-517 Change-Id: I550d7dac9a9686d60bec15655ac92dea9f36149c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>