From 81ce61c9459c85f53486e668b532fe43a4d40ff0 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 15 Mar 2011 15:36:33 +0100 Subject: Fix some warnings in font code Comma at the end of enumerator list and wrong initializer list on Mac. Reviewed-by: Jiang Jiang --- src/gui/text/qfont.h | 2 +- src/gui/text/qfont_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index ea65c17..8dbc746 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -90,7 +90,7 @@ public: NoAntialias = 0x0100, OpenGLCompatible = 0x0200, ForceIntegerMetrics = 0x0400, - NoFontMerging = 0x8000, + NoFontMerging = 0x8000 }; enum HintingPreference { diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index b23f96e..c1a5048 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -97,8 +97,8 @@ struct QFontDef uint stretch : 12; // 0-400 uint ignorePitch : 1; - uint fixedPitchComputed : 1; // for Mac OS X only uint hintingPreference : 2; + uint fixedPitchComputed : 1; // for Mac OS X only int reserved : 14; // for future extensions bool exactMatch(const QFontDef &other) const; -- cgit v0.12