1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStorageInfo/Linux: remove dependency on linux/mount.h

Browse Source 
It was introduced in December 2018, which is apparently too recent for
some Linux distributions. So remove the dependency that was there only
to give us MS_RDONLY and revert to the old statfs.h / sys/vfs.h flag.

We still don't include <sys/vfs.h> because it is absent on some old
Android versions.

Amends ea6abe583f8534495c3c43e2b6aab95742b102a3.

Fixes: QTBUG-123932
Change-Id: If1bf59ecbe014b569ba1fffd17c29cc448d16358
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 73003f3b41edb7f363a2492ad349899c54a2b890)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-04-02 17:12:55 -07:00 committed by Qt Cherry-pick Bot
parent 716bf5dd58
commit 2626a5bf1f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/io/qstorageinfo_linux.cpp
View File

@ -12,7 +12,6 @@
#include <q20memory.h>
#include <linux/mount.h>
#include <sys/ioctl.h>
#include <sys/statfs.h>
@ -24,6 +23,11 @@
# define FS_IOC_GETFSLABEL _IOR(0x94, 49, char[FSLABEL_MAX])
#endif
// or <linux/statfs.h>
#ifndef ST_RDONLY
# define ST_RDONLY 0x0001 /* mount read-only */
#endif
QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals;
@ -176,7 +180,7 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
blockSize = int(statfs_buf.f_bsize);
readOnly = (statfs_buf.f_flags & MS_RDONLY) != 0;
readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
}
}