diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-25 12:54:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-28 11:37:11 +0200 |
| commit | 2b134d46c21c86dd1cf66ba5e9c961714d73b3b3 (patch) | |
| tree | d4908ae8d78a228ad161e1237a1b0b5d3c5d98af /build_history/blacklist.txt | |
| parent | 84597fa46a6c0134cef514f749c3f072bfe6fe14 (diff) | |
| parent | 117e0ff91275b4bc06dd5383f19e7028c5ef6ff8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I073b05f8b39c0af32aa57ce3589c1aac2d712213
Diffstat (limited to 'build_history/blacklist.txt')
| -rw-r--r-- | build_history/blacklist.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt index bf3cc6d89..ddb1ad14d 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -62,6 +62,8 @@ # Crashes with Python 2 on Windows [QtQml::qqmlnetwork_test] py2 win32 +[QtQml::qquickitem_grabToImage] + darwin [smart::smart_pointer] win32 # PYSIDE-474 |