diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
| commit | 0441d959ff87431ab432ce0c30bbb857a631742e (patch) | |
| tree | 25c6c4293f74e39b9d4cf45b15957f233cffa9c5 /tests/auto/corelib/io/qsettings/BLACKLIST | |
| parent | ae0dd3201bc13b81c62752bb04e42362c78bfe16 (diff) | |
| parent | 8c685b765bf4ceba3c4cf8fdd9c9d680f338b7a9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5dbdc13c6133e5b03e362c5461b4a599d781bd1e
Diffstat (limited to 'tests/auto/corelib/io/qsettings/BLACKLIST')
| -rw-r--r-- | tests/auto/corelib/io/qsettings/BLACKLIST | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qsettings/BLACKLIST b/tests/auto/corelib/io/qsettings/BLACKLIST deleted file mode 100644 index 36d68bd918..0000000000 --- a/tests/auto/corelib/io/qsettings/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[isWritable:native] -osx-10.11 |