summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/text/qfont.h2
-rw-r--r--src/gui/text/qfont_p.h2
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;