summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qcompleter/tst_qcompleter.cpp2
-rw-r--r--tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index f7b9d98..43205e1 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -1011,7 +1011,7 @@ void tst_QCompleter::multipleWidgets()
QWidget window;
window.show();
QApplication::setActiveWindow(&window);
- QApplicaion::qWaitForWindowShown(&window);
+ QTest::qWaitForWindowShown(&window);
QTRY_VERIFY(qApp->activeWindow() == &window);
QFocusEvent focusIn(QEvent::FocusIn);
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index b92e140..f86e81d 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -55,10 +55,10 @@ public:
int duration() const { return -1; /* not time driven */ }
protected:
- void updateCurrentTime(int msecs)
+ void updateCurrentTime()
{
- QPropertyAnimation::updateCurrentTime(msecs);
- if (msecs >= QPropertyAnimation::duration())
+ QPropertyAnimation::updateCurrentTime();
+ if (currentTime() >= QPropertyAnimation::duration() || currentLoop() >= 1)
stop();
}
};
@@ -239,7 +239,7 @@ void tst_QPropertyAnimation::statesAndSignals()
{
QFETCH(bool, uncontrolled);
QPropertyAnimation *anim;
- if (uncontrolled)
+ if (uncontrolled)
anim = new UncontrolledAnimation;
else
anim = new DummyPropertyAnimation;