Fix build with Clang

We have to qualify calls to baseclass functions in templates. See:

  http://clang.llvm.org/compatibility.html#dep_lookup_bases

Change-Id: If779f1789d269f20a0255d63b1a7d6b9fef0118e
Reviewed-on: http://codereview.qt.nokia.com/3961
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index bf29086..0e04f2b 100644 (file)
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -1128,7 +1128,7 @@ void QDeclarativeVMEStack<T>::push(const T &o) {
 
     Q_ASSERT(_index <= VLA::size());
     if (_index == VLA::size())
-        append(o);
+        this->append(o);
     else
         VLA::data()[_index] = o;
 }

diff --git a/src/declarative/qml/v8/qscripttools_p.h b/src/declarative/qml/v8/qscripttools_p.h
index c8dace0..a718691 100644 (file)
--- a/src/declarative/qml/v8/qscripttools_p.h
+++ b/src/declarative/qml/v8/qscripttools_p.h
@@ -51,7 +51,7 @@ public:
 template<class N, QIntrusiveListNode N::*member>
 void QScriptIntrusiveList<N, member>::insert(N *n)
 {
-    Q_ASSERT_X(!contains(n), Q_FUNC_INFO, "Can't insert a value which is in the list already");
+    Q_ASSERT_X(!this->contains(n), Q_FUNC_INFO, "Can't insert a value which is in the list already");
     Q_ASSERT_X(!(n->*member).isInList(), Q_FUNC_INFO, "Can't insert a value which is in another list");
     QIntrusiveList<N, member>::insert(n);
 }
@@ -59,7 +59,7 @@ void QScriptIntrusiveList<N, member>::insert(N *n)
 template<class N, QIntrusiveListNode N::*member>
 void QScriptIntrusiveList<N, member>::remove(N *n)
 {
-    Q_ASSERT_X(contains(n), Q_FUNC_INFO, "Can't remove a value which is not in the list");
+    Q_ASSERT_X(this->contains(n), Q_FUNC_INFO, "Can't remove a value which is not in the list");
     QIntrusiveList<N, member>::remove(n);
 }