Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/quick/items/qquickaccessibleattached_p.h
	src/quick/items/qquickwindow.cpp
	src/quick/scenegraph/qsgthreadedrenderloop.cpp

Change-Id: I8bf07487a75f9d1b0d6efa5914dd06875fc9654d

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index 8224f8a851..7c66ee0049 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -80,23 +80,23 @@ public:
 
     FunctionCall(Function *function, qint64 start, qint64 end) :
         m_function(function), m_start(start), m_end(end)
-    { m_function->compilationUnit->ref(); }
+    { m_function->compilationUnit->addref(); }
 
     FunctionCall(const FunctionCall &other) :
         m_function(other.m_function), m_start(other.m_start), m_end(other.m_end)
-    { m_function->compilationUnit->ref(); }
+    { m_function->compilationUnit->addref(); }
 
     ~FunctionCall()
-    { m_function->compilationUnit->deref(); }
+    { m_function->compilationUnit->release(); }
 
     FunctionCall &operator=(const FunctionCall &other) {
         if (&other != this) {
             if (m_function)
-                m_function->compilationUnit->deref();
+                m_function->compilationUnit->release();
             m_function = other.m_function;
             m_start = other.m_start;
             m_end = other.m_end;
-            m_function->compilationUnit->ref();
+            m_function->compilationUnit->addref();
         }
         return *this;
     }