diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-10 23:00:12 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-09-10 23:00:12 (GMT) |
| commit | e59f140161ae48de4dc63df4ddff1d74ca7878f2 (patch) | |
| tree | b4b9f4f2703ca306b29dcdd0138f4debfc1ebc36 /src/gui/text/qrawfont.h | |
| parent | 1a2fb9970093a9d0ee60ab10e843a30ec418fce6 (diff) | |
| parent | 704dd92581783d91ccd234d58896d7078eed14a5 (diff) | |
| download | Qt-e59f140161ae48de4dc63df4ddff1d74ca7878f2.zip Qt-e59f140161ae48de4dc63df4ddff1d74ca7878f2.tar.gz Qt-e59f140161ae48de4dc63df4ddff1d74ca7878f2.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/text/qrawfont.h')
| -rw-r--r-- | src/gui/text/qrawfont.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index d5b5680..cf77996 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -81,7 +81,10 @@ public: bool isValid() const; QRawFont &operator=(const QRawFont &other); + bool operator==(const QRawFont &other) const; + inline bool operator!=(const QRawFont &other) const + { return !operator==(other); } QString familyName() const; QString styleName() const; @@ -132,9 +135,6 @@ public: private: friend class QRawFontPrivate; - - void detach(); - QExplicitlySharedDataPointer<QRawFontPrivate> d; }; |