Revert "QDistanceField: add missing copy assignment operator"
The reverts commit0624c99ea3
, which fixed a GCC 9 -Wdeprecated-copy warning by adding the copy assignment operator. The 5.12 change0e162315
fixed the same warning by removing the copy ctor. The mergeef37ab99
removed the copy ctor, but kept the assignment operator added by0624c99e
, bringing the original warning back, but with the roles of copy ctor and assignment operator reversed. One has to give. Change-Id: Ib32841df94a5ff80402a68b5fe776eb82e94136f Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
6aa6623437
commit
135aa77021
@ -899,9 +899,6 @@ QDistanceField::QDistanceField(int width, int height)
|
||||
{
|
||||
}
|
||||
|
||||
QDistanceField &QDistanceField::operator=(const QDistanceField &)
|
||||
= default;
|
||||
|
||||
QDistanceField::QDistanceField(const QRawFont &font, glyph_t glyph, bool doubleResolution)
|
||||
{
|
||||
setGlyph(font, glyph, doubleResolution);
|
||||
|
@ -94,7 +94,6 @@ public:
|
||||
QDistanceField(const QRawFont &font, glyph_t glyph, bool doubleResolution = false);
|
||||
QDistanceField(QFontEngine *fontEngine, glyph_t glyph, bool doubleResolution = false);
|
||||
QDistanceField(const QPainterPath &path, glyph_t glyph, bool doubleResolution = false);
|
||||
QDistanceField &operator=(const QDistanceField &other);
|
||||
|
||||
bool isNull() const;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user