summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-03-07 15:00:14 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-11 14:40:23 +0100
commit3a1ec49de2217069f11ed153efcd128c628d3f4a (patch)
tree83d02f5e7d783dadfac2f209c11fd01cf6c4488e
parent4c5520d868d0b3d90fb08e96e87aaf6731e00342 (diff)
Fix warning about overloaded virtual in qmlviewer (CLANG).
Change-Id: Id5f3f66a353a360e98957541e339a28ad0d301e5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
-rw-r--r--tools/qml/qdeclarativetester.cpp2
-rw-r--r--tools/qml/qdeclarativetester.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 6b7c395c..056216e2 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -355,7 +355,7 @@ void QDeclarativeTester::updateCurrentTime(int msec)
// Advance test script
while (testscript && testscript->count() > testscriptidx) {
- QObject *event = testscript->event(testscriptidx);
+ QObject *event = testscript->eventAt(testscriptidx);
if (QDeclarativeVisualTestFrame *frame = qobject_cast<QDeclarativeVisualTestFrame *>(event)) {
if (frame->msec() < msec) {
diff --git a/tools/qml/qdeclarativetester.h b/tools/qml/qdeclarativetester.h
index fc16565c..13bddbb5 100644
--- a/tools/qml/qdeclarativetester.h
+++ b/tools/qml/qdeclarativetester.h
@@ -65,7 +65,7 @@ public:
QDeclarativeListProperty<QObject> events() { return QDeclarativeListProperty<QObject>(this, m_events); }
int count() const { return m_events.count(); }
- QObject *event(int idx) { return m_events.at(idx); }
+ QObject *eventAt(int idx) const { return m_events.at(idx); }
private:
QList<QObject *> m_events;