# HG changeset patch
# User Chris Cannam
# Date 1558007301 -3600
# Node ID 29c6b3caefa92220dbf0e88e0785fda53c30db00
# Parent  1e7b7a62d3737d199c9b8c20f4c5f084f7d88f71# Parent  8ce940f9e32b612bb20c236db875ab39feae5388
Merge from default branch

diff -r 1e7b7a62d373 -r 29c6b3caefa9 data/fileio/test/BogusAudioFileReaderTest.h
--- a/data/fileio/test/BogusAudioFileReaderTest.h	Thu May 16 11:07:47 2019 +0100
+++ b/data/fileio/test/BogusAudioFileReaderTest.h	Thu May 16 12:48:21 2019 +0100
@@ -86,7 +86,7 @@
 
         AudioFileReader *reader =
             AudioFileReaderFactory::createReader(path, {});
-        QCOMPARE((void *)reader, nullptr);
+        QCOMPARE((void *)reader, 0);
     }
 
 };