diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-10 14:36:53 +0100 |
| commit | 7b15c669c336a1d76e3ac001fadde38a294e3e80 (patch) | |
| tree | 2b8e9631019d1bc9af37d9a93bb93ce0eb16381a /src/corelib/io/qsettings_p.h | |
| parent | 47bc34f413d9a0c6efac6ca3eead95eed7da2e40 (diff) | |
| parent | 86048e1a09fce11f557d0e8b117229a754ee9098 (diff) | |
Merge branch 'tools-team/4.6' (early part) into 4.6
Conflicts:
src/corelib/tools/qscopedpointer.h
Diffstat (limited to 'src/corelib/io/qsettings_p.h')
| -rw-r--r-- | src/corelib/io/qsettings_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index bcd8744111..5ad72e46dc 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -62,6 +62,7 @@ #ifndef QT_NO_QOBJECT #include "private/qobject_p.h" #endif +#include "private/qscopedpointer_p.h" #ifdef Q_OS_WIN #include "QtCore/qt_windows.h" |