diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-13 00:28:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-13 08:28:27 +0200 |
| commit | ae745746a666134d9e9258b8c2ff00540624d835 (patch) | |
| tree | 8294fffa3d752d61f79004fb04e21e927472fd8f /tests/auto/qml/qqmllanguage | |
| parent | a7b383ab989e74ef552c2ef9c38377e065f1ab0e (diff) | |
| parent | 531d00c1909527cb1bc28f17197267ccde408b0c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsapi/qjsengine.cpp
src/qml/qml/qqmlengine_p.h
src/quick/items/qquickanchors.cpp
src/quick/items/qquickanimatedimage_p_p.h
src/quick/items/qquickitem_p.h
tests/auto/qml/qqmlecmascript/testtypes.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/benchmarks/qml/creation/tst_creation.cpp
Change-Id: I65861e32f16e8a04c7090a90231627e1ebf6ba6f
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 |