diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-29 18:02:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 12:49:29 +0200 |
| commit | 11070a090a9cc77d02315a3cb39eaf628bd9bfe7 (patch) | |
| tree | f9ea6781a9694e991136ffb78fb1f1382cbe2c92 /tests/auto/qfiledialog2 | |
| parent | 253497b7446c7d723aa3bdd7152e25d6852f2604 (diff) | |
Added QWindow::isActive() and focus in / out events.
Renamed QGuiApplication::activeWindow() to
QGuiApplication::focusWindow(), implemented QWindow::isActive() as a
style hint, and added focus in / out events.
Change-Id: I71866e76c5a817def3e17bcc20a4fc32081a0e7a
Reviewed-on: http://codereview.qt-project.org/5811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'tests/auto/qfiledialog2')
| -rw-r--r-- | tests/auto/qfiledialog2/tst_qfiledialog2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp index 282e95313f..0edc028ce6 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp @@ -589,7 +589,7 @@ void tst_QFileDialog2::completionOnLevelAfterRoot() QCOMPARE(edit->text(), QString("completionOnLevelAfterRootTest")); current.rmdir("completionOnLevelAfterRootTest"); #else - QCOMPARE(edit->text(), QString("etc")); + QTRY_COMPARE(edit->text(), QString("etc")); #endif } |