diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-29 08:07:12 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-29 08:10:23 (GMT) |
| commit | cb5e526c6023237c36aac3446a0a18288f39f3a9 (patch) | |
| tree | 93b966928d212e59f0f7ee5522354dcbabe6b7d5 /src/gui | |
| parent | 18fcbf7ae41504324cd453ba9b9655f3e94f6495 (diff) | |
| download | Qt-cb5e526c6023237c36aac3446a0a18288f39f3a9.zip Qt-cb5e526c6023237c36aac3446a0a18288f39f3a9.tar.gz Qt-cb5e526c6023237c36aac3446a0a18288f39f3a9.tar.bz2 | |
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
Diffstat (limited to 'src/gui')
| -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 8dbc746..0c7b6f8 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 |