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 | |
| 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')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qfont.cpp | 1 | ||||
| -rw-r--r-- | src/gui/text/qfont_p.h | 3 |
3 files changed, 5 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 diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index d4c81b9..2d6af3b 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -147,6 +147,7 @@ bool QFontDef::exactMatch(const QFontDef &other) const && weight == other.weight && style == other.style && this_family == other_family + && (styleName.isEmpty() || other.styleName.isEmpty() || styleName == other.styleName) && (this_foundry.isEmpty() || other_foundry.isEmpty() || this_foundry == other_foundry) diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 8eeae6f..ebc842c 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -113,6 +113,7 @@ struct QFontDef && styleStrategy == other.styleStrategy && ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch && family == other.family + && (styleName.isEmpty() || other.styleName.isEmpty() || styleName == other.styleName) && hintingPreference == other.hintingPreference #ifdef Q_WS_X11 && addStyle == other.addStyle @@ -128,6 +129,8 @@ struct QFontDef if (styleHint != other.styleHint) return styleHint < other.styleHint; if (styleStrategy != other.styleStrategy) return styleStrategy < other.styleStrategy; if (family != other.family) return family < other.family; + if (!styleName.isEmpty() && !other.styleName.isEmpty() && styleName != other.styleName) + return styleName < other.styleName; if (hintingPreference != other.hintingPreference) return hintingPreference < other.hintingPreference; #ifdef Q_WS_X11 |