diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 05:28:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-17 05:28:59 (GMT) |
| commit | e969212de0b2ac816a46db8897d54e9ed78d57b8 (patch) | |
| tree | cb63c26476023c4f645f589d89790bc43328b469 /src | |
| parent | 80eb06b6e95ecf0b88534f15ddd9c6c892c08980 (diff) | |
| parent | 349213b37901c832f941a45e5ea630eac2fd2f26 (diff) | |
| download | Qt-e969212de0b2ac816a46db8897d54e9ed78d57b8.zip Qt-e969212de0b2ac816a46db8897d54e9ed78d57b8.tar.gz Qt-e969212de0b2ac816a46db8897d54e9ed78d57b8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compilation of qdrawhelper.cpp with XLC 10
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index bd5b0bd..5f190ba 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -4835,7 +4835,7 @@ void QT_FASTCALL blendUntransformed_dest24(DST *dest, const SRC *src, if (SRC::hasAlpha()) { while (length >= 4) { - const quint32 alpha = BYTE_MUL(uint(alpha_4(src)), uint(coverage)); + const quint32 alpha = QT_PREPEND_NAMESPACE(BYTE_MUL)(uint(alpha_4(src)), uint(coverage)); if (alpha) interpolate_pixel_4(dest, src, alpha); length -= 4; |