diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:17:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:17:24 +0200 |
| commit | 9b6d55ddf361f14c05c2965b29184a95e3c6a989 (patch) | |
| tree | a1b4327662b257f4d18541ed136062d3bc38b229 /tests/auto/qml/qqmllanguage | |
| parent | 9a7cf067a178c7a08a7ed9f2c6253e1feade5569 (diff) | |
| parent | 9530a6a8744e9eb2b4ed947b528ab7c51d8c360f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3c6a93917cb46868cdb9dd50566b90c70f67102e
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/BLACKLIST | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllanguage/BLACKLIST b/tests/auto/qml/qqmllanguage/BLACKLIST deleted file mode 100644 index c1c7e56df9..0000000000 --- a/tests/auto/qml/qqmllanguage/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[importsPath] -windows |