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

qstorageinfo_unix.cpp: Fix build on Solaris

Browse Source 
Task-number: QTBUG-44556
Change-Id: I22d791011866175ca88de88c0b1a7c4d9d397d8f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Dmitry Shachnev 2015-02-20 11:54:12 +03:00
parent dee1998d4e
commit 6f87e1b526
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/io/qstorageinfo_unix.cpp
View File

@ -62,6 +62,7 @@
# include <sys/statvfs.h> # include <sys/statvfs.h>
#elif defined(Q_OS_SOLARIS) #elif defined(Q_OS_SOLARIS)
# include <sys/mnttab.h> # include <sys/mnttab.h>
# include <sys/statvfs.h>
#else #else
# include <sys/statvfs.h> # include <sys/statvfs.h>
#endif #endif
@ -202,17 +203,17 @@ inline bool QStorageIterator::next()
inline QString QStorageIterator::rootPath() const inline QString QStorageIterator::rootPath() const
{ {
return QFile::decodeName(mnt->mnt_mountp); return QFile::decodeName(mnt.mnt_mountp);
} }
inline QByteArray QStorageIterator::fileSystemType() const inline QByteArray QStorageIterator::fileSystemType() const
{ {
return QByteArray(mnt->mnt_fstype); return QByteArray(mnt.mnt_fstype);
} }
inline QByteArray QStorageIterator::device() const inline QByteArray QStorageIterator::device() const
{ {
return QByteArray(mnt->mnt_mntopts); return QByteArray(mnt.mnt_mntopts);
} }
#elif defined(Q_OS_ANDROID) #elif defined(Q_OS_ANDROID)