Give names to enum used in templates.
The GHS toolchain needs names for enumerations that are used for template instantiation. Change-Id: I4e184cd77074fd7ece89f21317536e6006ab257d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>bb10
parent
209f1f0b75
commit
012e4b81fa
|
|
@ -3576,7 +3576,7 @@ void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object)
|
|||
emit q->focusObjectChanged(object);
|
||||
}
|
||||
|
||||
enum {
|
||||
enum MouseMasks {
|
||||
MouseCapsMask = 0xFF,
|
||||
MouseSourceMaskDst = 0xFF00,
|
||||
MouseSourceMaskSrc = MouseCapsMask,
|
||||
|
|
|
|||
|
|
@ -1856,6 +1856,8 @@ bool QPainterPath::contains(const QPointF &pt) const
|
|||
: ((winding_number % 2) != 0));
|
||||
}
|
||||
|
||||
enum PainterDirections { Left, Right, Top, Bottom };
|
||||
|
||||
static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y2,
|
||||
const QRectF &rect)
|
||||
{
|
||||
|
|
@ -1864,7 +1866,6 @@ static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y
|
|||
qreal top = rect.top();
|
||||
qreal bottom = rect.bottom();
|
||||
|
||||
enum { Left, Right, Top, Bottom };
|
||||
// clip the lines, after cohen-sutherland, see e.g. http://www.nondot.org/~sabre/graphpro/line6.html
|
||||
int p1 = ((x1 < left) << Left)
|
||||
| ((x1 > right) << Right)
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class QRgba64 {
|
|||
|
||||
// Make sure that the representation always has the order: red green blue alpha, independent
|
||||
// of byte order. This way, vector operations that assume 4 16-bit values see the correct ones.
|
||||
enum {
|
||||
enum Shifts {
|
||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
RedShift = 48,
|
||||
GreenShift = 32,
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ static const quint8 requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] =
|
|||
{ 14, 127 }, // Nko
|
||||
};
|
||||
|
||||
enum {
|
||||
enum CsbBits {
|
||||
Latin1CsbBit = 0,
|
||||
CentralEuropeCsbBit = 1,
|
||||
TurkishCsbBit = 4,
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ public:
|
|||
|
||||
// save/restore
|
||||
|
||||
enum { // sentinel values used to validate state data
|
||||
enum VersionMarkers { // sentinel values used to validate state data
|
||||
VersionMarker = 0xff
|
||||
};
|
||||
void saveState(QDataStream &stream) const;
|
||||
|
|
|
|||
Loading…
Reference in New Issue