diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 15:44:39 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 15:44:39 +0100 |
| commit | daf5f511ee813fc4fffba64bed558d0413270388 (patch) | |
| tree | 37fefb6189943606d184d2159577f7f2ce67b5db /tests | |
| parent | 89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff) | |
| parent | ded84966823eac0ae0275a2a7676d647d4d856ff (diff) | |
| download | qt4-tools-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/xmlpatternsxqts/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 3d801cced9..e027dd1bf4 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -3328,9 +3328,10 @@ void tst_QWidget::widgetAt() w2->lower(); qApp->processEvents(); QTRY_VERIFY((wr = QApplication::widgetAt(100, 100))); - QCOMPARE(wr->objectName(), QString("w1")); - + const bool match = (wr->objectName() == QString("w1")); w2->raise(); + QVERIFY(match); + qApp->processEvents(); QTRY_VERIFY((wr = QApplication::widgetAt(100, 100))); QCOMPARE(wr->objectName(), QString("w2")); diff --git a/tests/auto/xmlpatternsxqts/test/test.pro b/tests/auto/xmlpatternsxqts/test/test.pro index 603ae65b26..a69838af5e 100644 --- a/tests/auto/xmlpatternsxqts/test/test.pro +++ b/tests/auto/xmlpatternsxqts/test/test.pro @@ -24,5 +24,3 @@ win32 { else: DESTDIR = ../release } TARGET = tst_xmlpatternsxqts - -include (../../xmlpatterns.pri) diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index a3b13da9c4..39267c8de6 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -1,10 +1,10 @@ TEMPLATE = subdirs -SUBDIRS = test contains(QT_CONFIG,xmlpatterns) { SUBDIRS += lib !wince*:lib.file = lib/lib.pro test.depends = lib } +SUBDIRS += test # Needed on the win32-g++ setup and on the test machine arsia. INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \ |