summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-06-08 10:11:10 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-08 12:25:23 +0200
commit3fb67767fc7056d8832f9ff3c49caa10f3453036 (patch)
tree540918287becfbbdc90336d17180d4af74a9c86c
parentc2dddd8322d5eaa4da8321e62d9be09d205d2141 (diff)
Reorder member varibles in QGlyphRunPrivate to eliminate warning
Reviewed-by: Eskil (cherry picked from commit 74a1135341783449970d579b273d00c837ac14b0) Change-Id: I8e1c6bdc7f0957d8f389531f5f5682c536cdc286 Reviewed-on: http://codereview.qt.nokia.com/374 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
-rw-r--r--src/gui/text/qglyphrun_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index 1cb63b2403..a7745e68ce 100644
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -97,6 +97,10 @@ public:
QVector<QPointF> glyphPositions;
QRawFont rawFont;
+ uint overline : 1;
+ uint underline : 1;
+ uint strikeOut : 1;
+
const quint32 *glyphIndexData;
int glyphIndexDataSize;
@@ -107,10 +111,6 @@ public:
{
return glyphRun.d.data();
}
-
- uint overline : 1;
- uint underline : 1;
- uint strikeOut : 1;
};
QT_END_NAMESPACE