diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:05:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:05:24 (GMT) |
| commit | 08a5b8d504e86a80488a2a13525e700b6f8b3311 (patch) | |
| tree | 3e6b31daecfe217b355fa973f2f122da8468c0ac /tests/auto/qfiledialog2/tst_qfiledialog2.cpp | |
| parent | 3773fcb78db02a2577c89f755c07c2c7dbf0de74 (diff) | |
| parent | cb2980a09aefcc207eacb500d5a3c74f064859dd (diff) | |
| download | Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.zip Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.tar.gz Qt-08a5b8d504e86a80488a2a13525e700b6f8b3311.tar.bz2 | |
Merge remote branch 'origin/4.8' into 4.8-from-4.7
Diffstat (limited to 'tests/auto/qfiledialog2/tst_qfiledialog2.cpp')
| -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 5e9f130..dc3ca52 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp @@ -812,7 +812,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() break; } } - Q_ASSERT(filterCombo); + QVERIFY(filterCombo); filterCombo->setEditable(true); QTest::mouseClick(filterCombo, Qt::LeftButton); QTest::keyPress(filterCombo, Qt::Key_X); |