diff options
author | Janne Anttila <janne.anttila@digia.com> | 2010-02-26 08:14:53 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2010-02-26 08:17:49 (GMT) |
commit | 53e7dda038e9251ca7380d3717709764c580192e (patch) | |
tree | 890153e559ad2ac7a46d98080bbbcb4f55650fa6 /src/gui/itemviews | |
parent | 481fa3dd80d046779d4464fc50a8ad250ef9771c (diff) | |
download | Qt-53e7dda038e9251ca7380d3717709764c580192e.zip Qt-53e7dda038e9251ca7380d3717709764c580192e.tar.gz Qt-53e7dda038e9251ca7380d3717709764c580192e.tar.bz2 |
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
RVCT does not like static inline, and variables should not be defined
in case statement without braces. In this case the temp variable was
actually unnecessary.
Reviewed-By: TrustMe
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 555555e..bc6db90 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -2283,10 +2283,9 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event) case Qt::Key_Left: case Qt::Key_Right: #ifdef QT_KEYPAD_NAVIGATION - int colCount = d->model->columnCount(d->root); if (QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional && (QWidgetPrivate::canKeypadNavigate(Qt::Horizontal) - || (QWidgetPrivate::inTabWidget(this) && colCount > 1))) { + || (QWidgetPrivate::inTabWidget(this) && d->model->columnCount(d->root) > 1))) { event->accept(); // don't change focus break; } |