diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-02 22:41:34 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-02 22:41:34 (GMT) |
| commit | 82a63405863f527028302ceaeff957f9ee5176e2 (patch) | |
| tree | 445dc288777f9861611405e21c7e650c52255300 /tools | |
| parent | 825c7cf9d5d8e83074636c2feeefc15a3062781d (diff) | |
| parent | f29f1bb287c6b39bd1270802d1579f1c1d53f905 (diff) | |
| download | Qt-82a63405863f527028302ceaeff957f9ee5176e2.zip Qt-82a63405863f527028302ceaeff957f9ee5176e2.tar.gz Qt-82a63405863f527028302ceaeff957f9ee5176e2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/indexwindow.cpp | 10 | ||||
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindowmanager.cpp | 1 |
2 files changed, 8 insertions, 3 deletions
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) { diff --git a/tools/designer/src/components/formeditor/formwindowmanager.cpp b/tools/designer/src/components/formeditor/formwindowmanager.cpp index 23d8580..246c56f 100644 --- a/tools/designer/src/components/formeditor/formwindowmanager.cpp +++ b/tools/designer/src/components/formeditor/formwindowmanager.cpp @@ -196,6 +196,7 @@ bool FormWindowManager::eventFilter(QObject *o, QEvent *e) case QEvent::HoverEnter: case QEvent::HoverLeave: case QEvent::HoverMove: + case QEvent::AcceptDropsChange: return false; default: break; |