diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-07 08:09:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-07 08:10:25 +0200 |
| commit | 16c4aa7e227d7d24c1488f706f234dbb5ed8b6e7 (patch) | |
| tree | e22f50a5b9f78370c27666ba7eb59128c706f8fd | |
| parent | 8237570ecbfed6c82f32de725dd3011f664b73ca (diff) | |
| parent | 163b4634728cb66c79e255807167640e63f1f7d6 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Icda9c40a985ae1549d068ba1068bfbad4cc6e761
| -rw-r--r-- | build_history/blacklist.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_history/blacklist.txt b/build_history/blacklist.txt index f85027feb..af7a93729 100644 --- a/build_history/blacklist.txt +++ b/build_history/blacklist.txt @@ -1,3 +1,5 @@ +[pysidetest::delegatecreateseditor_test] + qt5.6 [pysidetest::modelview_test] darwin py3 [pysidetest::qvariant_test] @@ -30,6 +32,9 @@ linux darwin win32 +[QtWidgets::qstandarditemmodel_test] + py2 + py3 [QtTest::touchevent_test] linux darwin |