diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 5359016f6..e08d88a15 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -96,10 +96,9 @@ public: virtual bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const { return false; } struct FaceId { - FaceId() : index(0), encoding(0) {} + FaceId() : index(0) {} QByteArray filename; int index; - int encoding; }; virtual FaceId faceId() const { return FaceId(); } enum SynthesizedFlags { @@ -203,12 +202,12 @@ protected: inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId &f2) { - return (f1.index == f2.index) && (f1.encoding == f2.encoding) && (f1.filename == f2.filename); + return (f1.index == f2.index) && (f1.filename == f2.filename); } inline uint qHash(const QFontEngine::FaceId &f) { - return qHash((f.index << 16) + f.encoding) + qHash(f.filename); + return qHash(f.index << 16) + qHash(f.filename); }