diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /tests/auto/corelib/thread/qthread/tst_qthread.cpp | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'tests/auto/corelib/thread/qthread/tst_qthread.cpp')
| -rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 8eccd17376..41cfc52354 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1234,6 +1234,7 @@ public: bool unregisterTimer(int ) { return false; } bool unregisterTimers(QObject *) { return false; } QList<TimerInfo> registeredTimers(QObject *) const { return QList<TimerInfo>(); } + int remainingTime(int) { return 0; } void wakeUp() {} void interrupt() {} void flush() {} |