diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
| commit | 9d085bf0024c442b14b7d22bc629574058176deb (patch) | |
| tree | 98dc9c7703454906e66f022688bbc9a01f10ea5f /tests/auto/quick/qquicktext/BLACKLIST | |
| parent | 621c5b2b260d63fef7190c133f7384b8ccb93307 (diff) | |
| parent | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900
Diffstat (limited to 'tests/auto/quick/qquicktext/BLACKLIST')
| -rw-r--r-- | tests/auto/quick/qquicktext/BLACKLIST | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/quick/qquicktext/BLACKLIST b/tests/auto/quick/qquicktext/BLACKLIST index f400af1d10..531d981159 100644 --- a/tests/auto/quick/qquicktext/BLACKLIST +++ b/tests/auto/quick/qquicktext/BLACKLIST @@ -1,7 +1,5 @@ [dependentImplicitSizes] * -[mouseSelection] -* [lineLaidOutRelayout] msvc-2015 [fontSizeMode] |