diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-24 23:59:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-24 23:59:46 +0200 |
| commit | 1d077120f48cc1ad10fc31c2381b0b65a085c217 (patch) | |
| tree | f815cd94a96aa006d9fb38ee70958691ad6c2155 /tests/auto/corelib/tools/qlocale/BLACKLIST | |
| parent | 7af0ea5b0f883415927727c8ed10bb6256d1f12d (diff) | |
| parent | bd42e2f0cebb2fe8de77a054e9d30aa803749a61 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I5f1567c792992fc00f0256f39b76cfbe017e6a3a
Diffstat (limited to 'tests/auto/corelib/tools/qlocale/BLACKLIST')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/BLACKLIST | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qlocale/BLACKLIST b/tests/auto/corelib/tools/qlocale/BLACKLIST new file mode 100644 index 0000000000..3eac7c10ed --- /dev/null +++ b/tests/auto/corelib/tools/qlocale/BLACKLIST @@ -0,0 +1,2 @@ +[formatTimeZone] +osx |