diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:30:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-01-08 12:35:24 +0100 |
| commit | ad16478a76815f8f61d454bf7760aaf9ffbb4b51 (patch) | |
| tree | eefdd9219cc9d59b62e042f49fc7555b980cb7a4 /tests/auto/corelib/io/qfile | |
| parent | 80a741f3616290897ba0d9f1cbd3c9c5ee62da37 (diff) | |
| parent | 09c92863001790a0304a5ef389901ee2b5b6cdc2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Based on merge done by Liang Qi
Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f
Diffstat (limited to 'tests/auto/corelib/io/qfile')
| -rw-r--r-- | tests/auto/corelib/io/qfile/BLACKLIST | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qfile/BLACKLIST b/tests/auto/corelib/io/qfile/BLACKLIST index 7aac313b12..e3bc093c83 100644 --- a/tests/auto/corelib/io/qfile/BLACKLIST +++ b/tests/auto/corelib/io/qfile/BLACKLIST @@ -3,3 +3,7 @@ msvc-2015 [readLineStdin_lineByLine] msvc-2015 +[openStandardStreamsFileDescriptors] +osx +[openStandardStreamsBufferedStreams] +osx |