summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-10 12:26:12 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-10 12:26:12 (GMT)
commitea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c (patch)
tree47a26e1c68b49477a15a383caf6c1c1d0397c276 /src/corelib/io/qsettings.h
parent03b28bf56b2edd76ca55ec6e3702db7bca69e757 (diff)
parent1fddb14c4d0ee82ac66c89061e8a20932f961883 (diff)
downloadQt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.zip
Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.gz
Qt-ea953378e71afaa4b6eb7c95bbe2e507b2ab6a7c.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/io/qsettings.h')
-rw-r--r--src/corelib/io/qsettings.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index cbb24ba..41bce89 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -78,7 +78,7 @@ class Q_CORE_EXPORT QSettings
#ifndef QT_NO_QOBJECT
Q_OBJECT
#else
- QSettingsPrivate *d_ptr;
+ QScopedPointer<QSettingsPrivate> d_ptr;
#endif
Q_DECLARE_PRIVATE(QSettings)