summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qunicodetools_p.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-09-12 14:32:52 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 11:47:06 +0200
commitf4ebb061899da67aa26c08516fa7ee8c7b11dcbf (patch)
treec7c3e7fc08cfa0b84466cc549818999fe4863605 /src/corelib/tools/qunicodetools_p.h
parentbe8a76cffef8fccab777b8c3a1f7389f229b8e00 (diff)
Remove Q_PACKED from structures that do not need to be packed
These structures do not need to be packed. With some compilers, Q_PACKED was defined to be empty, which means that the code was working fine without packing. Or there were some lingering problems on those platforms (MSVC) and we're now exposing them in all platforms. Actually, it shouldn't be a problem anywhere. QCharAttributes, quint24 and QFontEngineQPA::Glyph have only char/uchar members, so they're packed already (they have alignof == 1). The only platform where that wasn't true was ARM OABI, which we don't support anymore. QFontEngineQPA::Header seems to always come from a QByteArray, so it doesn't neeed to be packed either. However, just to be sure, I'm inserting a check for alignment. And QFontEngineQPA::Block isn't used anywhere. Change-Id: Iacfa25edf336ef2a03aeb6e40ae90937a21661ae Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/corelib/tools/qunicodetools_p.h')
-rw-r--r--src/corelib/tools/qunicodetools_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/tools/qunicodetools_p.h
index 5db3126159..8201861a43 100644
--- a/src/corelib/tools/qunicodetools_p.h
+++ b/src/corelib/tools/qunicodetools_p.h
@@ -57,7 +57,7 @@
QT_BEGIN_NAMESPACE
-struct Q_PACKED QCharAttributes
+struct QCharAttributes
{
uchar graphemeBoundary : 1;
uchar wordBreak : 1;