diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /src/corelib/io/qstorageinfo_unix.cpp | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'src/corelib/io/qstorageinfo_unix.cpp')
| -rw-r--r-- | src/corelib/io/qstorageinfo_unix.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp index d120d7569a..7823787711 100644 --- a/src/corelib/io/qstorageinfo_unix.cpp +++ b/src/corelib/io/qstorageinfo_unix.cpp @@ -122,7 +122,11 @@ public: inline QByteArray device() const; private: #if defined(Q_OS_BSD4) +# if defined(Q_OS_NETBSD) + struct statvfs *stat_buf; +# else struct statfs *stat_buf; +# endif int entryCount; int currentIndex; #elif defined(Q_OS_SOLARIS) @@ -206,7 +210,7 @@ inline bool QStorageIterator::isValid() const inline bool QStorageIterator::next() { - return ::getmntent(fp, &mnt) == Q_NULLPTR; + return ::getmntent(fp, &mnt) == 0; } inline QString QStorageIterator::rootPath() const |