Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-12-15 21:05:00 +01:00
commit ecfbf72a57
33 changed files with 9516 additions and 347 deletions

View file

@ -211,6 +211,10 @@ void TestGui::testSearch()
// Search for "some"
QTest::keyClicks(searchEdit, "some");
QTRY_COMPARE(entryView->model()->rowCount(), 4);
// Press Down to focus on the entry view
QVERIFY(!entryView->hasFocus());
QTest::keyClick(searchEdit, Qt::Key_Down);
QVERIFY(entryView->hasFocus());
clickIndex(entryView->model()->index(0, 1), entryView, Qt::LeftButton);
QAction* entryEditAction = m_mainWindow->findChild<QAction*>("actionEntryEdit");