diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-29 10:07:12 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-29 10:12:27 +0200 |
| commit | e99aa8b20c25812746c2e2ce55296d678724fa7a (patch) | |
| tree | 69535fca44beb099951defba2bdbaba16cb37da6 /src | |
| parent | 8c90fb22c4032198870d5cc349dc8a09abcb0728 (diff) | |
Make sure QFont's resolve mask is copied on compilers with C++0x support
The QFont consists of a d pointer and a resolve mask, and they should
both be copied in the assignment operator.
Task-number: QTBUG-18921
Done-by: Friedemann Kleint
(cherry picked from commit cb5e526c6023237c36aac3446a0a18288f39f3a9)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfont.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 8dbc746813..0c7b6f8de8 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -239,7 +239,7 @@ public: bool isCopyOf(const QFont &) const; #ifdef Q_COMPILER_RVALUE_REFS inline QFont &operator=(QFont &&other) - { qSwap(d, other.d); return *this; } + { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask); return *this; } #endif #ifdef Q_WS_WIN |