Merge remote-tracking branch 'lukas/cleanup/qt4'

# Conflicts:
#	cmake/toolchains/common/MSYS.cmake
This commit is contained in:
Lukas W
2018-07-17 08:52:49 +02:00
57 changed files with 100 additions and 220 deletions

View File

@@ -1012,12 +1012,12 @@ QString SampleBuffer::openAudioFile() const
{
if( ofd.selectedFiles().isEmpty() )
{
return QString::null;
return QString();
}
return tryToMakeRelative( ofd.selectedFiles()[0] );
}
return QString::null;
return QString();
}