ed067d0808
Featuring Qt Platform Abstraction, threaded OpenGL support, multithreaded HTTP and optimized file system access.
30 lines
988 B
Text
30 lines
988 B
Text
$NetBSD: patch-al,v 1.9 2012/01/12 22:59:58 adam Exp $
|
|
|
|
--- src/corelib/io/qsettings.cpp.orig 2011-02-22 12:04:00.000000000 +0000
|
|
+++ src/corelib/io/qsettings.cpp
|
|
@@ -141,9 +141,16 @@ QT_END_INCLUDE_NAMESPACE
|
|
|
|
Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
|
|
{
|
|
+#ifdef QT_STATVFS
|
|
+ struct statvfs buf;
|
|
+ if (fstatvfs(handle, &buf) != 0)
|
|
+ return false;
|
|
+#else
|
|
struct statfs buf;
|
|
if (fstatfs(handle, &buf) != 0)
|
|
return false;
|
|
+#endif
|
|
+
|
|
return qt_isEvilFsTypeName(buf.f_fstypename);
|
|
}
|
|
|
|
@@ -177,7 +184,7 @@ Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyT
|
|
|
|
#elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
|
|
|| defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_SCO) \
|
|
- || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD)
|
|
+ || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT)
|
|
QT_BEGIN_INCLUDE_NAMESPACE
|
|
# include <sys/statvfs.h>
|
|
QT_END_INCLUDE_NAMESPACE
|