Merge pull request #11195 from Chocobo1/mac

Replace deprecated macro
This commit is contained in:
Mike Tzou 2019-09-07 11:58:23 +08:00 committed by GitHub
commit d2c21ce507
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 161 additions and 159 deletions

View file

@ -39,7 +39,7 @@
#if defined(Q_OS_WIN)
#include <Windows.h>
#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
#elif defined(Q_OS_MACOS) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
#include <sys/param.h>
#include <sys/mount.h>
#elif defined(Q_OS_HAIKU)
@ -321,7 +321,7 @@ bool Utils::Fs::isNetworkFileSystem(const QString &path)
return false;
return (::GetDriveTypeW(volumePath.get()) == DRIVE_REMOTE);
#elif defined(Q_OS_MAC) || defined(Q_OS_OPENBSD)
#elif defined(Q_OS_MACOS) || defined(Q_OS_OPENBSD)
QString file = path;
if (!file.endsWith('/'))
file += '/';