diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:00:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:00:12 (GMT) |
| commit | 6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca (patch) | |
| tree | a44b65b76e5816f1e0a9a4efa0672b8a6e59a0cc /src/gui/text/qfontinfo.h | |
| parent | 5e95f9c3c224b87840e750d4280806a40ed40c92 (diff) | |
| parent | 85b7896a47f9bb622b394107769cb7c1121a6995 (diff) | |
| download | Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.zip Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.tar.gz Qt-6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca.tar.bz2 | |
Merge commit 'widget/4.6' into origin/4.6
Conflicts:
src/gui/effects/qgraphicseffect.cpp
Diffstat (limited to 'src/gui/text/qfontinfo.h')
| -rw-r--r-- | src/gui/text/qfontinfo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index 335d761..0998949 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -43,6 +43,7 @@ #define QFONTINFO_H #include <QtGui/qfont.h> +#include <QtCore/qsharedpointer.h> QT_BEGIN_HEADER @@ -77,7 +78,7 @@ public: bool exactMatch() const; private: - QFontPrivate *d; + QExplicitlySharedDataPointer<QFontPrivate> d; }; QT_END_NAMESPACE |