summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2010-11-04 09:20:27 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-11-04 09:20:27 (GMT)
commit095f416f806062ab23d82c6907fffac4f862ee3b (patch)
treeabb8d31e4010df303dff5ea7add0aab85c17d3b9 /src/corelib
parent4fc2d7f1b14c26d10968c99dd296e056a2beed4d (diff)
downloadQt-095f416f806062ab23d82c6907fffac4f862ee3b.zip
Qt-095f416f806062ab23d82c6907fffac4f862ee3b.tar.gz
Qt-095f416f806062ab23d82c6907fffac4f862ee3b.tar.bz2
Fix tst_symbols auto test
Prefix isLikelyToBeNfs with a "q", even though it's only autotest-exported.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qsettings.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index c94ec7b..e6c5fb9 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -140,7 +140,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
# include <sys/mount.h>
QT_END_INCLUDE_NAMESPACE
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
{
struct statfs buf;
if (fstatfs(handle, &buf) != 0)
@@ -166,7 +166,7 @@ QT_END_INCLUDE_NAMESPACE
# define AUTOFSNG_SUPER_MAGIC 0x7d92b1a0
# endif
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
{
struct statfs buf;
if (fstatfs(handle, &buf) != 0)
@@ -183,7 +183,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
# include <sys/statvfs.h>
QT_END_INCLUDE_NAMESPACE
-Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
+Q_AUTOTEST_EXPORT_HELPER bool qIsLikelyToBeNfs(int handle)
{
struct statvfs buf;
if (fstatvfs(handle, &buf) != 0)
@@ -195,7 +195,7 @@ Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle)
#endif
}
#else
-Q_AUTOTEST_EXPORT_HELPER inline bool isLikelyToBeNfs(int /* handle */)
+Q_AUTOTEST_EXPORT_HELPER inline bool qIsLikelyToBeNfs(int /* handle */)
{
return true;
}
@@ -209,7 +209,7 @@ static bool unixLock(int handle, int lockType)
now is to disable locking when we detect NFS (or AutoFS or
CacheFS, which are probably wrapping NFS).
*/
- if (isLikelyToBeNfs(handle))
+ if (qIsLikelyToBeNfs(handle))
return false;
struct flock fl;