Modify QtQuick1 to build in Qt5

Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index a789996e..f314ffb8 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -42,7 +42,7 @@
 #include "private/qdeclarativexmllistmodel_p.h"
 
 #include <qdeclarativecontext.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <QDebug>
 #include <QStringList>
@@ -254,12 +254,12 @@ int QDeclarativeXmlQueryEngine::doQuery(QString query, QString namespaces, QByte
     {
         QMutexLocker m1(&m_mutex);
         m_queryIds.ref();
-        if (m_queryIds <= 0)
-            m_queryIds = 1;
+        if (m_queryIds.load() <= 0)
+            m_queryIds.store(1);
     }
 
     XmlQueryJob job;
-    job.queryId = m_queryIds;
+    job.queryId = m_queryIds.load();
     job.data = data;
     job.query = QLatin1String("doc($src)") + query;
     job.namespaces = namespaces;