diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 06:43:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 06:43:29 (GMT) |
| commit | 48f1ff3315f6d3fc05901ba6a83e02a79d9148fc (patch) | |
| tree | 65b7b2d95e7a375a56b9fe8d18599761bc0d4d8a | |
| parent | 754e72d64ee4da72fc8f277f697270be57f8a18e (diff) | |
| parent | 120e79b2726e8aef63eb321fe3de984a27921d9e (diff) | |
| download | Qt-48f1ff3315f6d3fc05901ba6a83e02a79d9148fc.zip Qt-48f1ff3315f6d3fc05901ba6a83e02a79d9148fc.tar.gz Qt-48f1ff3315f6d3fc05901ba6a83e02a79d9148fc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style assert fails to detect an index failure
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 5202701..14782d8 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1121,7 +1121,7 @@ QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list, &KAknsIIDQsnParentColors, &KAknsIIDQsnTextColors }; - Q_ASSERT((int)list <= (int)sizeof(idMap)/sizeof(idMap[0])); + Q_ASSERT((int)list < (int)sizeof(idMap)/sizeof(idMap[0])); const QColor color = QS60StyleModeSpecifics::colorValue(*idMap[(int) list], index - 1); return option ? QS60StylePrivate::stateColor(color, option) : color; } |