diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 01:01:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 01:01:20 (GMT) |
| commit | d134df1ffd8b4361645e6dc8354551a6c3f32891 (patch) | |
| tree | 69e2b21a492a79e5cc04f790d954e1435455c3a9 /src/gui/itemviews/qitemdelegate.cpp | |
| parent | f79ea0ecc9ebca896340babd370638a6cf607419 (diff) | |
| parent | f399b0deede15c7c5cb1108db261b77452afb394 (diff) | |
| download | Qt-d134df1ffd8b4361645e6dc8354551a6c3f32891.zip Qt-d134df1ffd8b4361645e6dc8354551a6c3f32891.tar.gz Qt-d134df1ffd8b4361645e6dc8354551a6c3f32891.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix escaping - by not using eval
escape backslashes in QMAKE_PRL_LIBS
fix & unify path separator escaping
Removed unused variable
Upgrade harfbuzz to the latest version
Diffstat (limited to 'src/gui/itemviews/qitemdelegate.cpp')
| -rw-r--r-- | src/gui/itemviews/qitemdelegate.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp index d5f6fd2..9bbfc23 100644 --- a/src/gui/itemviews/qitemdelegate.cpp +++ b/src/gui/itemviews/qitemdelegate.cpp @@ -667,7 +667,6 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o { Q_D(const QItemDelegate); - QPen pen = painter->pen(); QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; if (cg == QPalette::Normal && !(option.state & QStyle::State_Active)) |