diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /tests/auto/corelib/io | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'tests/auto/corelib/io')
| -rw-r--r-- | tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST index 10a4ba069e..90b714758a 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST +++ b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST @@ -1,9 +1,9 @@ # QTBUG-33574 QTBUG-30943 [signalsEmittedAfterFileMoved] -windows 32bit msvc-2010 -windows 64bit msvc +windows [watchFileAndItsDirectory:native backend-testfile] osx +windows [watchFileAndItsDirectory:native backend-specialchars] osx windows |