AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure QFont's resolve mask is copied on compilers with C++0x support

Browse Source 
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)
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2011-04-29 10:07:12 +02:00
parent 8c90fb22c4
commit e99aa8b20c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfont.h
View File

@ -239,7 +239,7 @@ public:
bool isCopyOf(const QFont &) const; bool isCopyOf(const QFont &) const;
#ifdef Q_COMPILER_RVALUE_REFS #ifdef Q_COMPILER_RVALUE_REFS
inline QFont &operator=(QFont &&other) inline QFont &operator=(QFont &&other)
{ qSwap(d, other.d); return *this; } { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask); return *this; }
#endif #endif
#ifdef Q_WS_WIN #ifdef Q_WS_WIN