diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2010-11-02 14:56:10 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2010-11-02 14:56:10 (GMT) |
| commit | 3923448118240a21cc169ea54d21f7ae1b324af8 (patch) | |
| tree | 2659acd3a0b9ea3d3281edd343ebadd9fddeb28a | |
| parent | e8544e43a200d769cef1f1c8f9fe3d728192a5f9 (diff) | |
| download | Qt-3923448118240a21cc169ea54d21f7ae1b324af8.zip Qt-3923448118240a21cc169ea54d21f7ae1b324af8.tar.gz Qt-3923448118240a21cc169ea54d21f7ae1b324af8.tar.bz2 | |
Export isLikelyToBeNfs only if we have an internal build
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index e5d182e..c94ec7b 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -88,6 +88,12 @@ #define CSIDL_APPDATA 0x001a // <username>\Application Data #endif +#ifdef Q_AUTOTEST_EXPORT +# define Q_AUTOTEST_EXPORT_HELPER Q_AUTOTEST_EXPORT +#else +# define Q_AUTOTEST_EXPORT_HELPER static +#endif + // ************************************************************************ // QConfFile @@ -134,7 +140,7 @@ QT_BEGIN_INCLUDE_NAMESPACE # include <sys/mount.h> QT_END_INCLUDE_NAMESPACE -Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle) { struct statfs buf; if (fstatfs(handle, &buf) != 0) @@ -160,7 +166,7 @@ QT_END_INCLUDE_NAMESPACE # define AUTOFSNG_SUPER_MAGIC 0x7d92b1a0 # endif -Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle) { struct statfs buf; if (fstatfs(handle, &buf) != 0) @@ -177,7 +183,7 @@ QT_BEGIN_INCLUDE_NAMESPACE # include <sys/statvfs.h> QT_END_INCLUDE_NAMESPACE -Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle) +Q_AUTOTEST_EXPORT_HELPER bool isLikelyToBeNfs(int handle) { struct statvfs buf; if (fstatvfs(handle, &buf) != 0) @@ -189,7 +195,7 @@ Q_AUTOTEST_EXPORT bool isLikelyToBeNfs(int handle) #endif } #else -Q_AUTOTEST_EXPORT inline bool isLikelyToBeNfs(int /* handle */) +Q_AUTOTEST_EXPORT_HELPER inline bool isLikelyToBeNfs(int /* handle */) { return true; } |