summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qcombobox
diff options
context:
space:
mode:
authorMorten Johan Sorvig <morten.sorvig@nokia.com>2011-12-16 13:12:39 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-14 23:02:12 +0100
commitd6311a06515221e41edb69722b571080c08d11ce (patch)
tree68d67e7f76fe0a826a2b6237890dfe9e3117e228 /tests/auto/widgets/widgets/qcombobox
parent439a78974576894b23bce0621e49ce4a593428a9 (diff)
Cocoa: Improve basic window handling.
Refactor NSWindow creation into createNSWindow and setNSWindow. This is necessary to support QMacNativeWidget where we re-use an already created window. Implement popup window handling. Make sure the window is displayed correctly and closes when it should. Take control over window activation in order to prevent infinite loops involving the QtCreator "cmd-k" window. Activation events are for now not sent to popup-type windows. There is now a different set of test failures: add and remove some QEXPECT_FAILs. Change-Id: I229761b59f90c9815b968eacc2cbc9c20cc5047e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qcombobox')
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index f9eb8b6159..4730d7d556 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -909,9 +909,6 @@ void tst_QComboBox::hide()
QTRY_VERIFY(testWidget->view()->isVisible());
testWidget->hidePopup();
//allow combobox effect to complete
-#ifdef Q_OS_MAC
- QEXPECT_FAIL("", "QTBUG-23678", Continue);
-#endif
QTRY_VERIFY(!testWidget->view()->isVisible());
testWidget->hide();
QVERIFY(!testWidget->isVisible());