diff options
Diffstat (limited to 'tests')
4 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 6a2d04d46d..d166b40c78 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -601,7 +601,7 @@ public: } void registerSocketNotifier(QSocketNotifier *) {} void unregisterSocketNotifier(QSocketNotifier *) {} - void registerTimer(int , int , QObject *) {} + void registerTimer(int , int , Qt::TimerType, QObject *) {} bool unregisterTimer(int ) { return false; } bool unregisterTimers(QObject *) { return false; } QList<TimerInfo> registeredTimers(QObject *) const { return QList<TimerInfo>(); } diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index 7fc8710ccf..1f8a3e03d9 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1228,7 +1228,7 @@ public: } void registerSocketNotifier(QSocketNotifier *) {} void unregisterSocketNotifier(QSocketNotifier *) {} - void registerTimer(int , int , QObject *) {} + void registerTimer(int, int, Qt::TimerType, QObject *) {} bool unregisterTimer(int ) { return false; } bool unregisterTimers(QObject *) { return false; } QList<TimerInfo> registeredTimers(QObject *) const { return QList<TimerInfo>(); } diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp index ccb69ddb6a..df7a6908f8 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp +++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp @@ -57,8 +57,7 @@ public: void interrupt() {} bool processEvents(QEventLoop::ProcessEventsFlags) { return false; } void registerSocketNotifier(QSocketNotifier*) {} - int registerTimer(int,QObject*) { return -1; } - void registerTimer(int,int,QObject*) {} + void registerTimer(int,int,Qt::TimerType,QObject*) {} QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); } void unregisterSocketNotifier(QSocketNotifier*) {} bool unregisterTimer(int) { return false; } diff --git a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp index cbe5af5ce8..bfb431e705 100644 --- a/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp +++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp @@ -57,8 +57,7 @@ public: void interrupt() {} bool processEvents(QEventLoop::ProcessEventsFlags) { return false; } void registerSocketNotifier(QSocketNotifier*) {} - int registerTimer(int,QObject*) { return -1; } - void registerTimer(int,int,QObject*) {} + void registerTimer(int,int,Qt::TimerType,QObject*) {} QList<TimerInfo> registeredTimers(QObject*) const { return QList<TimerInfo>(); } void unregisterSocketNotifier(QSocketNotifier*) {} bool unregisterTimer(int) { return false; } |