From dbf35e498db723ae9850686e462ec4f45bc7b67c Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Tue, 31 Jan 2012 11:22:08 +1000
Subject: Modify QtQuick1 to build in Qt5

Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 .../debugger/qdeclarativedebugserver.cpp           |  6 ++--
 .../debugger/qdeclarativedebugserverconnection_p.h | 15 ++++++++--
 .../debugger/qdeclarativeinspectorinterface_p.h    |  2 +-
 .../debugger/qdeclarativeinspectorservice.cpp      |  2 +-
 src/declarative/debugger/qjsdebugservice.cpp       |  2 +-
 src/declarative/declarative.pro                    | 34 +++++++++-------------
 .../graphicsitems/qdeclarativeborderimage.cpp      |  1 +
 .../graphicsitems/qdeclarativeflipable.cpp         |  2 +-
 .../graphicsitems/qdeclarativefocuspanel.cpp       |  2 +-
 .../graphicsitems/qdeclarativegraphicswidget_p.h   |  2 +-
 .../graphicsitems/qdeclarativegridview.cpp         |  2 +-
 src/declarative/graphicsitems/qdeclarativeitem.cpp |  4 +--
 src/declarative/graphicsitems/qdeclarativeitem.h   | 10 +++----
 .../graphicsitems/qdeclarativeitemsmodule.cpp      |  4 +--
 .../graphicsitems/qdeclarativelistview.cpp         |  2 +-
 .../graphicsitems/qdeclarativeloader.cpp           |  4 +--
 .../graphicsitems/qdeclarativepathview_p_p.h       |  2 +-
 .../graphicsitems/qdeclarativerectangle.cpp        |  1 +
 .../graphicsitems/qdeclarativetextinput.cpp        |  2 +-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  | 32 ++++++++++----------
 .../qml/parser/qdeclarativejsparser.cpp            |  2 +-
 src/declarative/qml/qdeclarative.h                 | 10 +++----
 .../qml/qdeclarativecompiledbindings.cpp           |  2 +-
 src/declarative/qml/qdeclarativecomponent.h        |  4 +--
 src/declarative/qml/qdeclarativedata_p.h           |  1 -
 src/declarative/qml/qdeclarativeengine.cpp         | 10 ++-----
 src/declarative/qml/qdeclarativeengine.h           |  4 +--
 src/declarative/qml/qdeclarativeexpression.h       |  2 +-
 src/declarative/qml/qdeclarativeextensionplugin.h  |  2 +-
 src/declarative/qml/qdeclarativeimport.cpp         |  2 +-
 src/declarative/qml/qdeclarativeinfo.h             |  2 +-
 src/declarative/qml/qdeclarativemetatype.cpp       |  6 ++--
 src/declarative/qml/qdeclarativetypeloader.cpp     |  2 +-
 src/declarative/qml/qdeclarativetypeloader_p.h     |  4 +--
 src/declarative/qml/qdeclarativeworkerscript.cpp   |  2 +-
 src/declarative/qml/qdeclarativexmlhttprequest.cpp |  2 +-
 src/declarative/qml/rewriter/textwriter_p.h        |  2 +-
 src/declarative/util/qdeclarativeanimation.cpp     | 12 ++++----
 src/declarative/util/qdeclarativeapplication.cpp   |  2 +-
 src/declarative/util/qdeclarativebehavior.cpp      |  6 ++--
 src/declarative/util/qdeclarativeconnections.cpp   |  6 ++--
 src/declarative/util/qdeclarativelistaccessor.cpp  |  4 +--
 src/declarative/util/qdeclarativelistmodel.cpp     |  6 ++--
 .../util/qdeclarativeopenmetaobject.cpp            |  2 +-
 .../util/qdeclarativepropertychanges.cpp           | 12 ++++----
 .../util/qdeclarativespringanimation.cpp           |  2 +-
 src/declarative/util/qdeclarativestate.cpp         |  4 +--
 src/declarative/util/qdeclarativestategroup.cpp    |  4 +--
 .../util/qdeclarativestateoperations.cpp           |  4 +--
 .../util/qdeclarativetransitionmanager.cpp         |  6 ++--
 src/declarative/util/qdeclarativeview.cpp          |  4 +--
 src/declarative/util/qdeclarativeview.h            |  8 ++---
 src/declarative/util/qdeclarativexmllistmodel.cpp  |  8 ++---
 53 files changed, 141 insertions(+), 139 deletions(-)

(limited to 'src/declarative')

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index c664f960..9de95445 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -116,7 +116,7 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
         QDataStream out(&message, QIODevice::WriteOnly);
         out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
     }
-    connection->send(message);
+    connection->send(QList<QByteArray>() << message);
 }
 
 QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
@@ -268,7 +268,7 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
             QDataStream out(&helloAnswer, QIODevice::WriteOnly);
             out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
         }
-        d->connection->send(helloAnswer);
+        d->connection->send(QList<QByteArray>() << helloAnswer);
 
         d->gotHello = true;
 
@@ -399,7 +399,7 @@ void QDeclarativeDebugServer::sendMessage(QDeclarativeDebugService *service,
         QDataStream out(&msg, QIODevice::WriteOnly);
         out << service->name() << message;
     }
-    d->connection->send(msg);
+    d->connection->send(QList<QByteArray>() << msg);
 }
 
 bool QDeclarativeDebugServer::waitForMessage(QDeclarativeDebugService *service)
diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
index 16fa798e..1f237d26 100644
--- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
+++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
@@ -42,7 +42,18 @@
 #ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H
 #define QDECLARATIVEDEBUGSERVERCONNECTION_H
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeglobal_p.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 QT_BEGIN_HEADER
 
@@ -60,7 +71,7 @@ public:
     virtual void setServer(QDeclarativeDebugServer *server) = 0;
     virtual void setPort(int port, bool bock) = 0;
     virtual bool isConnected() const = 0;
-    virtual void send(const QByteArray &message) = 0;
+    virtual void send(const QList<QByteArray> &messages) = 0;
     virtual void disconnect() = 0;
     virtual bool waitForMessage() = 0;
 };
diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
index bd7cd954..0ee2f07b 100644
--- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEOBSERVERINTERFACE_H
 #define QDECLARATIVEOBSERVERINTERFACE_H
 
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <QtQuick1/private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
index b651b259..cfb6dcb2 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QPluginLoader>
 
-#include <QtDeclarative/QDeclarativeView>
+#include <QtQuick1/QDeclarativeView>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/debugger/qjsdebugservice.cpp b/src/declarative/debugger/qjsdebugservice.cpp
index 686710dc..062eda62 100644
--- a/src/declarative/debugger/qjsdebugservice.cpp
+++ b/src/declarative/debugger/qjsdebugservice.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qdatastream.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQuick1/qdeclarativeengine.h>
 
 Q_GLOBAL_STATIC(QJSDebugService, serviceInstance)
 
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 055e4b93..2232ac34 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,8 +1,19 @@
-TARGET     = QtDeclarative
+load(qt_module)
+
+TARGET     = QtQuick1
 QPRO_PWD   = $$PWD
-QT         = core gui script network
+
+QT         += core core-private gui gui-private widgets widgets-private script script-private network xmlpatterns
 contains(QT_CONFIG, svg): QT += svg
+
+CONFIG += module
+MODULE_PRI = ../../modules/qt_quick1.pri
+
+MODULE=quick1
+load(qt_module_config)
+
 DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
+
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
@@ -13,29 +24,12 @@ exists("qdeclarative_enable_gcov") {
     LIBS += -lgcov
 }
 
-include(../qbase.pri)
-
-#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
-#DESTDIR=.
-
 #modules
+include(qml/qml.pri)
 include(util/util.pri)
 include(graphicsitems/graphicsitems.pri)
-include(qml/qml.pri)
 include(debugger/debugger.pri)
 
-symbian: {
-    TARGET.UID3=0x2001E623
-    LIBS += -lefsrv -lhal
-
-    contains(QT_CONFIG, freetype) {
-        DEFINES += QT_NO_FONTCONFIG
-        INCLUDEPATH += \
-            ../3rdparty/freetype/src \
-            ../3rdparty/freetype/include
-    }
-}
-
 linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND
 
 DEFINES += QT_NO_OPENTYPE
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 5babbb2b..f01aeecd 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -48,6 +48,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
+#include <QtWidgets/qdrawutil.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 11569607..0c300a3e 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -46,7 +46,7 @@
 
 #include <qdeclarativeinfo.h>
 
-#include <QtGui/qgraphicstransform.h>
+#include <QtWidgets/qgraphicstransform.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
index 489ee901..97eea741 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -43,7 +43,7 @@
 
 #include "private/qdeclarativeitem_p.h"
 
-#include <QtGui/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsscene.h>
 #include <QEvent>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
index 93242aca..079c8b60 100644
--- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVEGRAPHICSWIDGET_P_H
 
 #include <QObject>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQuick1/qdeclarativecomponent.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 1d9348c7..d1c40a93 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -45,7 +45,7 @@
 #include "private/qdeclarativeflickable_p_p.h"
 
 #include "private/qdeclarativesmoothedanimation_p_p.h"
-#include <qdeclarativeguard_p.h>
+#include <private/qdeclarativeguard_p.h>
 
 #include <qlistmodelinterface_p.h>
 #include <QKeyEvent>
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index fa6e8e11..1c370af4 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -44,7 +44,7 @@
 #include "private/qdeclarativeevents_p_p.h"
 #include <private/qdeclarativeengine_p.h>
 #include <private/qgraphicsitem_p.h>
-#include <QtDeclarative/private/qdeclarativeitem_p.h>
+#include <QtQuick1/private/qdeclarativeitem_p.h>
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativeopenmetaobject_p.h>
@@ -60,7 +60,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QtCore/qnumeric.h>
 #include <QtScript/qscriptengine.h>
-#include <QtGui/qgraphicstransform.h>
+#include <QtWidgets/qgraphicstransform.h>
 #include <qlistmodelinterface_p.h>
 
 #include <float.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index ce8c9453..b57c38ea 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -42,15 +42,15 @@
 #ifndef QDECLARATIVEITEM_H
 #define QDECLARATIVEITEM_H
 
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQuick1/qdeclarative.h>
+#include <QtQuick1/qdeclarativecomponent.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qgraphicstransform.h>
+#include <QtWidgets/qgraphicsitem.h>
+#include <QtWidgets/qgraphicstransform.h>
 #include <QtGui/qfont.h>
-#include <QtGui/qaction.h>
+#include <QtWidgets/qaction.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index e9af7e7d..e440d7e1 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -41,9 +41,9 @@
 
 #include "private/qdeclarativeitemsmodule_p.h"
 
-#include <QtGui/qaction.h>
+#include <QtWidgets/qaction.h>
 #include <QtGui/qvalidator.h>
-#include <QtGui/qgraphicseffect.h>
+#include <QtWidgets/qgraphicseffect.h>
 
 #include "private/qdeclarativeevents_p_p.h"
 #include "private/qdeclarativescalegrid_p_p.h"
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 331dc35f..a1580756 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -47,7 +47,7 @@
 #include "private/qdeclarativesmoothedanimation_p_p.h"
 #include <qdeclarativeexpression.h>
 #include <qdeclarativeengine.h>
-#include <qdeclarativeguard_p.h>
+#include <private/qdeclarativeguard_p.h>
 #include <qdeclarativeinfo.h>
 
 #include <qlistmodelinterface_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index f55cc9b9..8fee8620 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -42,8 +42,8 @@
 #include "private/qdeclarativeloader_p_p.h"
 
 #include <qdeclarativeinfo.h>
-#include <qdeclarativeengine_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index b226f79e..2faabbf7 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -60,7 +60,7 @@
 
 #include <qdeclarative.h>
 #include <qdeclarativeanimation_p_p.h>
-#include <qdeclarativeguard_p.h>
+#include <private/qdeclarativeguard_p.h>
 
 #include <qdatetime.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index e4389ec1..dbbf238b 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -45,6 +45,7 @@
 #include <QPainter>
 #include <QStringBuilder>
 #include <QtCore/qmath.h>
+#include <QtWidgets/qdrawutil.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 18db4fda..2d519bed 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -893,7 +893,7 @@ void QDeclarativeTextInput::setEchoMode(QDeclarativeTextInput::EchoMode echo)
     Q_D(QDeclarativeTextInput);
     if (echoMode() == echo)
         return;
-    d->control->setEchoMode((uint)echo);
+    d->control->setEchoMode(QLineControl::EchoMode(echo));
     d->updateInputMethodHints();
     q_textChanged();
     emit echoModeChanged(echoMode());
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 3f71e574..cd40b689 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -44,23 +44,23 @@
 #include "qdeclarativeitem.h"
 
 #include <qdeclarativecontext.h>
-#include <qdeclarativecontext_p.h>
+#include <private/qdeclarativecontext_p.h>
 #include <qdeclarativeengine.h>
 #include <qdeclarativeexpression.h>
 #include <qdeclarativepackage_p.h>
 #include <qdeclarativeopenmetaobject_p.h>
 #include <qdeclarativelistaccessor_p.h>
 #include <qdeclarativeinfo.h>
-#include <qdeclarativedata_p.h>
-#include <qdeclarativepropertycache_p.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativedata_p.h>
+#include <private/qdeclarativepropertycache_p.h>
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 #include <qgraphicsscene.h>
 #include <qlistmodelinterface_p.h>
 #include <qhash.h>
 #include <qlist.h>
-#include <qmetaobjectbuilder_p.h>
+#include <private/qmetaobjectbuilder_p.h>
 #include <QtCore/qdebug.h>
 
 #include <private/qobject_p.h>
@@ -288,8 +288,8 @@ public:
                 for (int ii = 0; ii < m_roles.count(); ++ii)
                     m_roleNames.insert(m_listModelInterface->toString(m_roles.at(ii)).toUtf8(), m_roles.at(ii));
             } else if (m_abstractItemModel) {
-                for (QHash<int,QByteArray>::const_iterator it = m_abstractItemModel->roleNames().begin();
-                        it != m_abstractItemModel->roleNames().end(); ++it) {
+                for (QHash<int,QByteArray>::const_iterator it = m_abstractItemModel->roleNames().constBegin();
+                        it != m_abstractItemModel->roleNames().constEnd(); ++it) {
                     m_roles.append(it.key());
                     m_roleNames.insert(*it, it.key());
                 }
@@ -316,8 +316,8 @@ public:
         if (!m_metaDataCreated) {
             ensureRoles();
             if (m_roleNames.count()) {
-                QHash<QByteArray, int>::const_iterator it = m_roleNames.begin();
-                while (it != m_roleNames.end()) {
+                QHash<QByteArray, int>::const_iterator it = m_roleNames.constBegin();
+                while (it != m_roleNames.constEnd()) {
                     int propId = m_delegateDataType->createProperty(it.key()) - m_delegateDataType->propertyOffset();
                     m_roleToPropId.insert(*it, propId);
                     ++it;
@@ -349,7 +349,7 @@ public:
         QObject *item(int index) {
             QObject *item = 0;
             QHash<int, ObjectRef>::const_iterator it = find(index);
-            if (it != end())
+            if (it != constEnd())
                 item = (*it).obj;
             return item;
         }
@@ -458,7 +458,7 @@ int QDeclarativeVisualDataModelData::propForRole(int id) const
 {
     QDeclarativeVisualDataModelPrivate *model = QDeclarativeVisualDataModelPrivate::get(m_model);
     QHash<int,int>::const_iterator it = model->m_roleToPropId.find(id);
-    if (it != model->m_roleToPropId.end())
+    if (it != model->m_roleToPropId.constEnd())
         return *it;
 
     return -1;
@@ -515,7 +515,7 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
     } else if (model->m_listModelInterface) {
         model->ensureRoles();
         QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
-        if (it != model->m_roleNames.end()) {
+        if (it != model->m_roleNames.constEnd()) {
             QVariant value = model->m_listModelInterface->data(data->m_index, *it);
             return value;
         } else if (model->m_roles.count() == 1 && propName == "modelData") {
@@ -530,7 +530,7 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
             return model->m_abstractItemModel->hasChildren(index);
         } else {
             QHash<QByteArray,int>::const_iterator it = model->m_roleNames.find(propName);
-            if (it != model->m_roleNames.end()) {
+            if (it != model->m_roleNames.constEnd()) {
                 return model->m_abstractItemModel->data(index, *it);
             } else if (model->m_roles.count() == 1 && propName == "modelData") {
                 //for compatibility with other lists, assign modelData if there is only a single role
@@ -1203,8 +1203,8 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count,
         }
     }
 
-    for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::ConstIterator iter = d->m_cache.begin();
-        iter != d->m_cache.end(); ++iter) {
+    for (QHash<int,QDeclarativeVisualDataModelPrivate::ObjectRef>::ConstIterator iter = d->m_cache.constBegin();
+        iter != d->m_cache.constEnd(); ++iter) {
         const int idx = iter.key();
 
         if (idx >= index && idx < index+count) {
diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
index da2dd7e5..0dfc28e3 100644
--- a/src/declarative/qml/parser/qdeclarativejsparser.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/QtDebug>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 #include <string.h>
 
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index f0893b2e..b4fba4f6 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -42,11 +42,11 @@
 #ifndef QDECLARATIVE_H
 #define QDECLARATIVE_H
 
-#include <QtDeclarative/qdeclarativeprivate.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
-#include <QtDeclarative/qdeclarativepropertyvaluesource.h>
-#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h>
-#include <QtDeclarative/qdeclarativelist.h>
+#include <QtQuick1/qdeclarativeprivate.h>
+#include <QtQuick1/qdeclarativeparserstatus.h>
+#include <QtQuick1/qdeclarativepropertyvaluesource.h>
+#include <QtQuick1/qdeclarativepropertyvalueinterceptor.h>
+#include <QtQuick1/qdeclarativelist.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetaobject.h>
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 798c97f2..3a7bd51e 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -44,7 +44,7 @@
 
 #include "private/qdeclarativecompiledbindings_p.h"
 
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQuick1/qdeclarativeinfo.h>
 #include <private/qdeclarativecontext_p.h>
 #include <private/qdeclarativejsast_p.h>
 #include <private/qdeclarativejsengine_p.h>
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 50954ad7..bc079e4d 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVECOMPONENT_H
 #define QDECLARATIVECOMPONENT_H
 
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeerror.h>
+#include <QtQuick1/qdeclarative.h>
+#include <QtQuick1/qdeclarativeerror.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h
index b26c4d51..495b4cfc 100644
--- a/src/declarative/qml/qdeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedata_p.h
@@ -92,7 +92,6 @@ public:
     static void objectNameChanged(QAbstractDeclarativeData *, QObject *);
 
     void destroyed(QObject *);
-    void parentChanged(QObject *, QObject *);
     void objectNameChanged(QObject *);
 
     void setImplicitDestructible() {
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 39a1733e..af9d0d8f 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -96,7 +96,6 @@
 #include <QtCore/qmutex.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
-#include <QtGui/qsound.h>
 #include <QtCore/qcryptographichash.h>
 
 #include <private/qobject_p.h>
@@ -552,7 +551,9 @@ void QDeclarativeData::destroyed(QAbstractDeclarativeData *d, QObject *o)
 
 void QDeclarativeData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p)
 {
-    static_cast<QDeclarativeData *>(d)->parentChanged(o, p);
+    Q_UNUSED(d)
+    Q_UNUSED(o)
+    Q_UNUSED(p)
 }
 
 void QDeclarativeData::objectNameChanged(QAbstractDeclarativeData *d, QObject *o)
@@ -1169,11 +1170,6 @@ void QDeclarativeData::destroyed(QObject *object)
         delete this;
 }
 
-void QDeclarativeData::parentChanged(QObject *, QObject *parent)
-{
-    if (!parent && scriptValue) { delete scriptValue; scriptValue = 0; }
-}
-
 void QDeclarativeData::objectNameChanged(QObject *)
 {
     if (extendedData) objectNameNotifier()->notify();
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
index fd061159..1f925eb3 100644
--- a/src/declarative/qml/qdeclarativeengine.h
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -46,8 +46,8 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qmap.h>
 #include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qdeclarativeerror.h>
-#include <QtDeclarative/qdeclarativedebug.h>
+#include <QtQuick1/qdeclarativeerror.h>
+#include <QtQuick1/qdeclarativedebug.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 732aa747..7a8055c0 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEEXPRESSION_H
 #define QDECLARATIVEEXPRESSION_H
 
-#include <QtDeclarative/qdeclarativeerror.h>
+#include <QtQuick1/qdeclarativeerror.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 7ae49870..e8bc5083 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qplugin.h>
 
-#include <QtDeclarative/qdeclarativeextensioninterface.h>
+#include <QtQuick1/qdeclarativeextensioninterface.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index a3592f93..e79ffe46 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/qpluginloader.h>
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qalgorithms.h>
-#include <QtDeclarative/qdeclarativeextensioninterface.h>
+#include <QtQuick1/qdeclarativeextensioninterface.h>
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativetypenamecache_p.h>
 #include <private/qdeclarativeengine_p.h>
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index e97d8412..206c2702 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarativeerror.h>
+#include <QtQuick1/qdeclarativeerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index d46eb78b..33f74225 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeprivate.h>
+#include <QtQuick1/qdeclarativeprivate.h>
 #include "private/qdeclarativemetatype_p.h"
 
 #include "private/qdeclarativeproxymetaobject_p.h"
@@ -992,13 +992,13 @@ QT_END_NAMESPACE
 #include <QtGui/qbrush.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qpalette.h>
-#include <QtGui/qicon.h>
+#include <QtWidgets/qicon.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qpolygon.h>
 #include <QtGui/qregion.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qcursor.h>
-#include <QtGui/qsizepolicy.h>
+#include <QtWidgets/qsizepolicy.h>
 #include <QtGui/qkeysequence.h>
 #include <QtGui/qpen.h>
 
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 4fa45102..75868f1c 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -47,7 +47,7 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativedebugtrace_p.h>
 
-#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQuick1/qdeclarativecomponent.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qdiriterator.h>
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index d377b4b9..3b8e07bd 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -55,8 +55,8 @@
 
 #include <QtCore/qobject.h>
 #include <QtNetwork/qnetworkreply.h>
-#include <QtDeclarative/qdeclarativeerror.h>
-#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtQuick1/qdeclarativeerror.h>
+#include <QtQuick1/qdeclarativeengine.h>
 #include <private/qdeclarativescriptparser_p.h>
 #include <private/qdeclarativedirparser_p.h>
 #include <private/qdeclarativeimport_p.h>
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index be283eae..a1fd4cce 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -55,7 +55,7 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qdatetime.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
-#include <QtDeclarative/qdeclarativeinfo.h>
+#include <QtQuick1/qdeclarativeinfo.h>
 #include "qdeclarativenetworkaccessmanagerfactory.h"
 
 
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 3348a7d2..f6f9ea8d 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -46,7 +46,7 @@
 #include "private/qdeclarativerefcount_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativeexpression_p.h"
-#include "qdeclarativeglobal_p.h"
+#include "private/qdeclarativeglobal_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtScript/qscriptvalue.h>
diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h
index 472539d5..1f70a48f 100644
--- a/src/declarative/qml/rewriter/textwriter_p.h
+++ b/src/declarative/qml/rewriter/textwriter_p.h
@@ -42,7 +42,7 @@
 #ifndef TEXTWRITER_H
 #define TEXTWRITER_H
 
-#include <qdeclarativejsglobal_p.h>
+#include <private/qdeclarativejsglobal_p.h>
 
 #include <QtCore/QString>
 #include <QtCore/QList>
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 496520e6..028deff4 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -50,12 +50,12 @@
 #include <qdeclarative.h>
 #include <qdeclarativeinfo.h>
 #include <qdeclarativeexpression.h>
-#include <qdeclarativestringconverters_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativemetatype_p.h>
-#include <qdeclarativevaluetype_p.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativestringconverters_p.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativemetatype_p.h>
+#include <private/qdeclarativevaluetype_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <qvariant.h>
 #include <qcolor.h>
diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp
index af80aede..f83b782c 100644
--- a/src/declarative/util/qdeclarativeapplication.cpp
+++ b/src/declarative/util/qdeclarativeapplication.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeapplication_p.h"
 #include <private/qobject_p.h>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 8921bee6..a49c7501 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -46,9 +46,9 @@
 
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 7c9c9336..82f0e679 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -42,10 +42,10 @@
 #include "private/qdeclarativeconnections_p.h"
 
 #include <qdeclarativeexpression.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativeboundsignal_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativeboundsignal_p.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativecontext_p.h>
+#include <private/qdeclarativecontext_p.h>
 #include <qdeclarativeinfo.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp
index 5a0e2fde..23000d88 100644
--- a/src/declarative/util/qdeclarativelistaccessor.cpp
+++ b/src/declarative/util/qdeclarativelistaccessor.cpp
@@ -41,13 +41,13 @@
 
 #include "private/qdeclarativelistaccessor_p.h"
 
-#include <qdeclarativemetatype_p.h>
+#include <private/qdeclarativemetatype_p.h>
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 // ### Remove me
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativeengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index b87f9144..ca0733d1 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -43,9 +43,9 @@
 #include "private/qdeclarativelistmodelworkeragent_p.h"
 #include "private/qdeclarativeopenmetaobject_p.h"
 
-#include <qdeclarativecustomparser_p.h>
-#include <qdeclarativeparser_p.h>
-#include <qdeclarativeengine_p.h>
+#include <private/qdeclarativecustomparser_p.h>
+#include <private/qdeclarativeparser_p.h>
+#include <private/qdeclarativeengine_p.h>
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
 
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index 6290bf93..02f6bbb7 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -42,7 +42,7 @@
 #include "private/qdeclarativeopenmetaobject_p.h"
 #include "private/qdeclarativepropertycache_p.h"
 #include "private/qdeclarativedata_p.h"
-#include <qmetaobjectbuilder_p.h>
+#include <private/qmetaobjectbuilder_p.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 97c6a1a1..a9e9f463 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -47,14 +47,14 @@
 #include "private/qdeclarativecompiler_p.h"
 
 #include <qdeclarativeinfo.h>
-#include <qdeclarativecustomparser_p.h>
-#include <qdeclarativeparser_p.h>
+#include <private/qdeclarativecustomparser_p.h>
+#include <private/qdeclarativeparser_p.h>
 #include <qdeclarativeexpression.h>
-#include <qdeclarativebinding_p.h>
+#include <private/qdeclarativebinding_p.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativeguard_p.h>
-#include <qdeclarativeproperty_p.h>
-#include <qdeclarativecontext_p.h>
+#include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativeproperty_p.h>
+#include <private/qdeclarativecontext_p.h>
 #include <qdeclarativestate_p_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index 034c54b2..5f81413d 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -42,7 +42,7 @@
 #include "private/qdeclarativespringanimation_p.h"
 
 #include "private/qdeclarativeanimation_p_p.h"
-#include <qdeclarativeproperty_p.h>
+#include <private/qdeclarativeproperty_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 23871088..6ed5f840 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -48,8 +48,8 @@
 #include "private/qdeclarativeanimation_p.h"
 #include "private/qdeclarativeanimation_p_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 29be45e9..705d176e 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -44,8 +44,8 @@
 #include "private/qdeclarativetransition_p.h"
 #include "private/qdeclarativestate_p_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qstringbuilder.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 30c5730d..ec48dc60 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -47,7 +47,7 @@
 #include <qdeclarativeinfo.h>
 #include <qdeclarativeanchors_p_p.h>
 #include <qdeclarativeitem_p.h>
-#include <qdeclarativeguard_p.h>
+#include <private/qdeclarativeguard_p.h>
 #include <qdeclarativenullablevalue_p_p.h>
 #include "private/qdeclarativecontext_p.h"
 #include "private/qdeclarativeproperty_p.h"
@@ -55,7 +55,7 @@
 #include "private/qdeclarativestate_p_p.h"
 
 #include <QtCore/qdebug.h>
-#include <QtGui/qgraphicsitem.h>
+#include <QtWidgets/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
 #include <private/qobject_p.h>
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 0cd66c05..c02da16e 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -44,9 +44,9 @@
 #include "private/qdeclarativestate_p_p.h"
 #include "private/qdeclarativestate_p.h"
 
-#include <qdeclarativebinding_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativeproperty_p.h>
+#include <private/qdeclarativebinding_p.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeproperty_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index ec357ffb..f726cf43 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -45,8 +45,8 @@
 #include <qdeclarativeitem.h>
 #include <qdeclarativeengine.h>
 #include <qdeclarativecontext.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativeguard_p.h>
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativeguard_p.h>
 
 #include <private/qdeclarativedebugtrace_p.h>
 #include <private/qdeclarativeinspectorservice_p.h>
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index 043460c8..e428e43e 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -44,10 +44,10 @@
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qurl.h>
-#include <QtGui/qgraphicssceneevent.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qwidget.h>
-#include <QtDeclarative/qdeclarativedebug.h>
+#include <QtWidgets/qgraphicssceneevent.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qwidget.h>
+#include <QtQuick1/qdeclarativedebug.h>
 
 QT_BEGIN_HEADER
 
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;
-- 
cgit v1.2.3