diff options
| author | axis <qt-info@nokia.com> | 2009-05-20 11:44:05 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-20 11:44:05 (GMT) |
| commit | 91e041fcff000024e619de5d7561ce141cb99d99 (patch) | |
| tree | 0fc7285a4a1634f6a74499c324d00b6aef181974 /tests/auto/qsplitter | |
| parent | d68629e4cfb94776b8ef02cd01cf0b02bf430db8 (diff) | |
| parent | 25f86fbab2e7d23832b0bb8ae8530289258e2aa5 (diff) | |
| download | Qt-91e041fcff000024e619de5d7561ce141cb99d99.zip Qt-91e041fcff000024e619de5d7561ce141cb99d99.tar.gz Qt-91e041fcff000024e619de5d7561ce141cb99d99.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
Diffstat (limited to 'tests/auto/qsplitter')
| -rw-r--r-- | tests/auto/qsplitter/tst_qsplitter.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index b463f7f..51bd99f 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -55,6 +55,7 @@ #include <qtreeview.h> #include <qlabel.h> #include <qdebug.h> // for file error messages +#include "../../shared/util.h" //TESTED_CLASS= //TESTED_FILES= @@ -1341,9 +1342,7 @@ void tst_QSplitter::task187373_addAbstractScrollAreas() if (addOutsideConstructor) splitter->addWidget(w); - qApp->processEvents(); - - QVERIFY(w->isVisible()); + QTRY_VERIFY(w->isVisible()); QVERIFY(!w->isHidden()); QVERIFY(w->viewport()->isVisible()); QVERIFY(!w->viewport()->isHidden()); |