diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-05 13:43:45 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-06 02:58:53 (GMT) |
| commit | 79fb5a199c320e146700ca6af3016888520ab9ad (patch) | |
| tree | 426534f4942706b25c05d68c0422f7a0ed1b4cf3 /tests | |
| parent | 92b07d2b7054025a661a4c2de226d84a5be4d48f (diff) | |
| download | Qt-79fb5a199c320e146700ca6af3016888520ab9ad.zip Qt-79fb5a199c320e146700ca6af3016888520ab9ad.tar.gz Qt-79fb5a199c320e146700ca6af3016888520ab9ad.tar.bz2 | |
Test fix on Mac
(cherry picked from commit eda93b795b044542a4247a086e4c2eed454123e4)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qlineedit/tst_qlineedit.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qtreewidget/tst_qtreewidget.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 1417e69..8368114 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -3493,6 +3493,7 @@ void tst_QLineEdit::task241436_passwordEchoOnEditRestoreEchoMode() testWidget->setEchoMode(QLineEdit::PasswordEchoOnEdit); testWidget->setFocus(); + QApplication::setActiveWindow(testWidget); QTRY_VERIFY(testWidget->hasFocus()); QTest::keyPress(testWidget, '0'); diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index 4a74d96..11c4543 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -468,6 +468,7 @@ void tst_QTreeWidget::editItem() QTest::ignoreMessage(QtWarningMsg, "edit: editing failed"); tree.editItem(item, col); QApplication::instance()->processEvents(); + QApplication::instance()->processEvents(); QLineEdit *editor = qFindChild<QLineEdit*>(&tree); if (editor) { QVERIFY(item->flags() & Qt::ItemIsEditable); diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index 531e48b..bcc988a 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -14,7 +14,10 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { win32:PATTERNIST_SDK = $${PATTERNIST_SDK}d else: PATTERNIST_SDK = $${PATTERNIST_SDK}_debug } -LIBS += -l$$PATTERNIST_SDK -lQtXml + +LIBS += -l$$PATTERNIST_SDK + +QT += xml INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto/xmlpatternsxqts/lib/ \ $$QT_BUILD_TREE/include/QtXmlPatterns/private \ |