[Development] Qt 5.2 header diff: QtGui

[Thiago Macieira]

On terça-feira, 5 de novembro de 2013 11:22:45, Marc Mutz wrote:
> On Tuesday, November 05, 2013 01:07:32 Thiago Macieira wrote:
> > @@ -206,7 +212,8 @@ protected:
> >      int qt4D;
> >      Qt::Orientation qt4O;
> >      Qt::MouseButtons mouseState;
> > 
> > -    int reserved;
> > +    uint ph : 2;
> > +    int reserved : 30;
> > 
> >  };
> >  #endif
> 
> is sizeof(int) == 4 everywhere?

Yes. We depend on that on far too many places. Qt would break horribly if that 
changed.

> > --- a/src/gui/text/qtextoption.h
> > +++ b/src/gui/text/qtextoption.h
> > 
> > @@ -134,7 +134,8 @@ private:
> >      uint wordWrap : 4;
> >      uint design : 1;
> >      uint direction : 2;
> > 
> > -    uint unused : 18;
> > +    uint unused : 17;
> > +    uint unused2; // ### Qt 6: remove unnecessary, extra 32 bits
> > 
> >      uint f;
> >      qreal tab;
> >      QTextOptionPrivate *d;
> 
> Overflown bit field? And the same question as above...

Yes. The bit field had overflown before (8+4+1+2+18 = 33), I just made it 
explicit.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.qt-project.org/pipermail/development/attachments/20131105/25cc1173/attachment.sig>