summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-12-09 15:10:09 +0100
committerAndy Shaw <andy.shaw@digia.com>2015-01-23 10:35:14 +0100
commit906577c8b0045724b9b961926085e933c8e0d339 (patch)
tree25a3f72ebc3ae65610ce48cd5d8e27aea9206ecc /tests/auto
parentcebd6d59cb52bad59e4056691c8eb04690858897 (diff)
Enter/Return should cause an edit inside an itemview on OS X
This was available before but was protected with the wrong define for OS X, so this is changed to the right define. Task-number: QTBUG-23696 QTBUG-23703 Change-Id: I669a6cf2ff7c01020693adff9f04a4b8b9404d02 Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp3
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp3
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 92200618d6..92f768586a 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -1299,9 +1299,6 @@ void tst_QFiledialog::clearLineEdit()
#endif
QTest::qWait(2000);
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("", "QTBUG-23703", Abort);
-#endif
QVERIFY(fd.directory().absolutePath() != QDir::home().absolutePath());
QVERIFY(!lineEdit->text().isEmpty());
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 6ab93ba6db..0ca836d946 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -861,9 +861,6 @@ void tst_QTreeView::editTriggers()
}
// Check if we got an editor
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("EditKeyPressed 4", "QTBUG-23696", Continue);
-#endif
QTRY_COMPARE(view.findChild<QLineEdit *>(QString()) != 0, editorOpened);
}