diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:49 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 18:04:49 +0200 |
commit | 71907f5c887faf7d6cb5fa916ed5e9d485f74cf6 (patch) | |
tree | 05a5730d9299ee192faec93eed7756d4265231d8 | |
parent | 4afefb066fb70aaa7dd564c7285db4c4658b6ee5 (diff) | |
parent | af503cb8014c5b0fb2928ac1596a042d979a94a3 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I51b5541943de39d87eed4887a879eeacb3a7e376
-rw-r--r-- | tests/auto/declarative/qdeclarativetextinput/BLACKLIST | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativetextinput/BLACKLIST b/tests/auto/declarative/qdeclarativetextinput/BLACKLIST new file mode 100644 index 00000000..13d5eba7 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetextinput/BLACKLIST @@ -0,0 +1,2 @@ +[validators] +osx |