53299a69f3
* General Improvements * Fixed incorrect behavior of the widget editing mode that could occur when a form was resized. * Fixed a crash that could occur when several commands were redone in one go. * Enabled MSVC and Borland project generators for the Qt Open Source edition. * Ensured that the QMAKE_CC and QMAKE_CXX variables are not defined in the Xcode project generator to allow distributed (distcc) builds to work again. * more...
30 lines
995 B
Text
30 lines
995 B
Text
$NetBSD: patch-al,v 1.3 2007/10/13 12:02:15 adam Exp $
|
|
|
|
--- src/corelib/io/qsettings.cpp.orig 2007-10-01 15:06:03.000000000 +0200
|
|
+++ src/corelib/io/qsettings.cpp
|
|
@@ -120,9 +120,16 @@ inline bool qt_isEvilFsTypeName(const ch
|
|
|
|
static bool isLikelyToBeNfs(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);
|
|
}
|
|
|
|
@@ -150,7 +157,7 @@ static bool isLikelyToBeNfs(int handle)
|
|
|
|
#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_QNX6) || defined(Q_OS_SCO) \
|
|
- || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD)
|
|
+ || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT)
|
|
# include <sys/statvfs.h>
|
|
|
|
static bool isLikelyToBeNfs(int handle)
|