diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:00 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:06 +0100 |
| commit | 1c0b494ae0d780230e2ed410ef74353dc1a2ea77 (patch) | |
| tree | dedac7c676ebd9dafdfc2879e5a330e4f69ba367 /tests | |
| parent | 315b4325d0b55d1104d1615fa6f7ecc12465f8f2 (diff) | |
| parent | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (diff) | |
| download | qtlocation-1c0b494ae0d780230e2ed410ef74353dc1a2ea77.tar.gz | |
Merge remote-tracking branch 'gerrit/5.7' into 5.8
Conflicts:
tests/auto/declarative_ui/BLACKLIST
Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/BLACKLIST | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/declarative_ui/BLACKLIST b/tests/auto/declarative_ui/BLACKLIST index 57e1bf74..27e7887d 100644 --- a/tests/auto/declarative_ui/BLACKLIST +++ b/tests/auto/declarative_ui/BLACKLIST @@ -1,2 +1,5 @@ [MapKeepGrabAndPreventSteal::test_map_preventsteal] * + +[MapKeepGrabAndPreventSteal::test_flick] +* |