diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-28 08:49:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-28 08:49:27 (GMT) |
| commit | e059416ca027831405a1a291b325a345d8248ffc (patch) | |
| tree | 5f0477deb13614099672b02fc5225b4171ecd9a0 /src/gui/graphicsview | |
| parent | 3c67a14ad0db0e83e70b2432394f168ce279518b (diff) | |
| parent | ac5dd6599abddf4e0191be11b4768529d641e1aa (diff) | |
| download | Qt-e059416ca027831405a1a291b325a345d8248ffc.zip Qt-e059416ca027831405a1a291b325a345d8248ffc.tar.gz Qt-e059416ca027831405a1a291b325a345d8248ffc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Reorder variable to eliminate warnings
Only compare styleNames if they are not empty
Add styleName to QFontDef comparison
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/gui/graphicsview/qgraphicswidget_p.h index 6ea2586..fd96fce 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.h +++ b/src/gui/graphicsview/qgraphicswidget_p.h @@ -182,12 +182,12 @@ public: return (attributes & (1 << bit)) != 0; } // 32 bits - quint32 refCountInvokeRelayout : 16; quint32 attributes : 10; quint32 inSetGeometry : 1; quint32 polished: 1; quint32 inSetPos : 1; quint32 autoFillBackground : 1; + quint32 refCountInvokeRelayout : 16; quint32 padding : 2; // feel free to use // Focus |