diff options
| author | Jing Bai <jing.t.bai@nokia.com> | 2012-08-28 16:02:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 14:07:39 +0200 |
| commit | 6210b2018ac917325a9c53d311ed53810909373e (patch) | |
| tree | 2f690cc320dd070415c8640a296bc4b98f176839 /src | |
| parent | 4692432b61b09f010a3a7e57e80b9599686fe438 (diff) | |
wrap the implementation with NO_SETTINGS macro
To fix a compile issue where the header is wrapped but the
implementation is not.
Change-Id: I9d4e30a251e9f5de71710eb6bf784fb2eb396698
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qsettings_mac.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index ddb9ab581a..68cc50c89b 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -40,6 +40,8 @@ ****************************************************************************/ #include "qsettings.h" +#ifndef QT_NO_SETTINGS + #include "qsettings_p.h" #include "qdatetime.h" #include "qdir.h" @@ -696,3 +698,4 @@ bool QConfFileSettingsPrivate::writePlistFile(const QString &fileName, } QT_END_NAMESPACE +#endif //QT_NO_SETTINGS |