diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
| commit | e1ef51cdddf4187ab68d09f42438e45a6bbf85f4 (patch) | |
| tree | e1a59bdb9e3695f43064b6fa7f6ab33d5ef359ca /tools/assistant | |
| parent | b495786061febf5e4c6baddbd6443f44f142c627 (diff) | |
| parent | 82a63405863f527028302ceaeff957f9ee5176e2 (diff) | |
| download | Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.zip Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.gz Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/tools/assistant/doc/assistant.qdocconf | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/indexwindow.cpp | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf index 161d34f..0a7ffe0 100644 --- a/tools/assistant/tools/assistant/doc/assistant.qdocconf +++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf @@ -12,5 +12,5 @@ HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ "<td width=\"30%\" align=\"left\">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \ "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \ - "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.0</div></td>\n" \ + "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \ "</tr></table></div></address>" diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp index 6d35649..97828c1 100644 --- a/tools/assistant/tools/assistant/indexwindow.cpp +++ b/tools/assistant/tools/assistant/indexwindow.cpp @@ -112,18 +112,22 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e) case Qt::Key_Up: idx = m_indexWidget->model()->index(idx.row()-1, idx.column(), idx.parent()); - if (idx.isValid()) + if (idx.isValid()) { m_indexWidget->setCurrentIndex(idx); + return true; + } break; case Qt::Key_Down: idx = m_indexWidget->model()->index(idx.row()+1, idx.column(), idx.parent()); - if (idx.isValid()) + if (idx.isValid()) { m_indexWidget->setCurrentIndex(idx); + return true; + } break; case Qt::Key_Escape: emit escapePressed(); - break; + return true; default: ; // stop complaining } } else if (obj == m_indexWidget && e->type() == QEvent::ContextMenu) { |