diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-01 13:24:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-01 13:24:34 (GMT) |
| commit | 6e021a61316ff0b281e8542858d4442cef7ed70c (patch) | |
| tree | 19ed48c75e376b5258db06626f79067a7335852b /demos/gradients/gradients.cpp | |
| parent | d448205c2e7ae31ae0814696c2c1d38ff56385bd (diff) | |
| parent | f79ce83f487b384133a2657f33f7c2853d8e89a2 (diff) | |
| download | Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.zip Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.tar.gz Qt-6e021a61316ff0b281e8542858d4442cef7ed70c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (26 commits)
Add a brief to all demos and examples for manifest
QSslCertificate: also check common name for blacklisted certificates
QSslCertificate: regenerate blacklisted certificates, they were expired
don't crash when destroying the shortcuts
Doc: added since tag to QDateTime::msecsTo
QSslCertificate: blacklist fraudulent *.google.com
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
Disable activeqt on win32-g++ (it doesn't build).
fix warning
remove unused functions
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix a typo in qt-conf docs.
Revert "Fix build with the Clang compiler"
Added missing no_include_pwd check
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Fix build with the Clang compiler
Change spacing of title in offline style.
Add support for rawFonts loaded from data in FaceId
examples: fix compilation with namespaced Qt.
...
Diffstat (limited to 'demos/gradients/gradients.cpp')
| -rw-r--r-- | demos/gradients/gradients.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/gradients/gradients.cpp b/demos/gradients/gradients.cpp index d8b739b..338d8eb 100644 --- a/demos/gradients/gradients.cpp +++ b/demos/gradients/gradients.cpp @@ -219,7 +219,7 @@ void GradientEditor::pointsUpdated() for (int i=0; i<points.size(); ++i) { qreal x = int(points.at(i).x()); - if (i < points.size() - 1 && x == points.at(i+1).x()) + if (i+1 < points.size() && x == points.at(i+1).x()) continue; QColor color((0x00ff0000 & m_red_shade->colorAt(int(x))) >> 16, (0x0000ff00 & m_green_shade->colorAt(int(x))) >> 8, |