diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:54:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:56:20 +0200 |
| commit | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (patch) | |
| tree | 7d3b63836c7ec0cce618ce4180c9f5ed63900a6a /tests/auto/quick/qquicktext | |
| parent | 93d7c26653757755ae65f14d06d6df6f9ec2fc07 (diff) | |
| parent | c849f3a7eff55d60c4010831ec67336c5c0f2a27 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicktext/BLACKLIST
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I8bd68b0b5e853b7908791d2cbddd18dd527c76ae
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -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 223d8feb67..c2e7ef03c0 100644 --- a/tests/auto/quick/qquicktext/BLACKLIST +++ b/tests/auto/quick/qquicktext/BLACKLIST @@ -1,6 +1,4 @@ [dependentImplicitSizes] * -[mouseSelection] -* [lineLaidOutRelayout] msvc-2015 |