summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-12 23:58:33 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-12 23:58:33 (GMT)
commitaa541b875bbaa514d90a5fa9ea6119e8a525db55 (patch)
treed11722f7bc2203950fe52c14008a814e0db4b9a2 /src/declarative
parent4e3f88c8b1d74b720bf3e17f9bdedf84a9748b3d (diff)
downloadQt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.zip
Qt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.tar.gz
Qt-aa541b875bbaa514d90a5fa9ea6119e8a525db55.tar.bz2
Do not use "QtDeclarative/XXX" style includes in declarative module code,
as it breaks reinstalling the module against existing Qt.
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsanchors.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsanchors_p.h4
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsborderimage.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsevents_p_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsflickable_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsflipable.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsflipable_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsimagebase.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsimagebase_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.h4
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem_p.h6
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsloader_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspainteditem_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsparticles_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspath_p.h4
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspathview_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspositioners_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsrectangle_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsrepeater_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicstext_p.h2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h2
-rw-r--r--src/declarative/qml/qml.h10
-rw-r--r--src/declarative/qml/qmlbinding.h6
-rw-r--r--src/declarative/qml/qmlbinding_p.h4
-rw-r--r--src/declarative/qml/qmlbindingoptimizations_p.h2
-rw-r--r--src/declarative/qml/qmlboundsignal_p.h2
-rw-r--r--src/declarative/qml/qmlcompiler.cpp2
-rw-r--r--src/declarative/qml/qmlcompiler_p.h4
-rw-r--r--src/declarative/qml/qmlcomponent.h4
-rw-r--r--src/declarative/qml/qmlcomponent_p.h6
-rw-r--r--src/declarative/qml/qmlcompositetypemanager.cpp4
-rw-r--r--src/declarative/qml/qmlcompositetypemanager_p.h4
-rw-r--r--src/declarative/qml/qmlcontext.cpp2
-rw-r--r--src/declarative/qml/qmlcontext_p.h2
-rw-r--r--src/declarative/qml/qmlcustomparser_p.h4
-rw-r--r--src/declarative/qml/qmldom.h2
-rw-r--r--src/declarative/qml/qmlengine.cpp4
-rw-r--r--src/declarative/qml/qmlengine_p.h8
-rw-r--r--src/declarative/qml/qmlenginedebug.cpp4
-rw-r--r--src/declarative/qml/qmlexpression.h2
-rw-r--r--src/declarative/qml/qmlinfo.cpp2
-rw-r--r--src/declarative/qml/qmlintegercache.cpp2
-rw-r--r--src/declarative/qml/qmllist.h2
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp2
-rw-r--r--src/declarative/qml/qmlmetatype.h8
-rw-r--r--src/declarative/qml/qmlobjectscriptclass.cpp2
-rw-r--r--src/declarative/qml/qmlparser_p.h2
-rw-r--r--src/declarative/qml/qmlpropertycache.cpp2
-rw-r--r--src/declarative/qml/qmlproxymetaobject_p.h2
-rw-r--r--src/declarative/qml/qmlscriptparser_p.h2
-rw-r--r--src/declarative/qml/qmlsqldatabase.cpp2
-rw-r--r--src/declarative/qml/qmlvme.cpp2
-rw-r--r--src/declarative/qml/qmlvme_p.h2
-rw-r--r--src/declarative/qml/qmlvmemetaobject_p.h2
-rw-r--r--src/declarative/qml/qmlwatcher.cpp6
-rw-r--r--src/declarative/qml/qmlxmlhttprequest.cpp2
-rw-r--r--src/declarative/util/qmlanimation.cpp2
-rw-r--r--src/declarative/util/qmlanimation_p.h6
-rw-r--r--src/declarative/util/qmlanimation_p_p.h4
-rw-r--r--src/declarative/util/qmlbehavior.cpp4
-rw-r--r--src/declarative/util/qmlbehavior_p.h6
-rw-r--r--src/declarative/util/qmlbind.cpp4
-rw-r--r--src/declarative/util/qmlbind_p.h2
-rw-r--r--src/declarative/util/qmlconnection.cpp4
-rw-r--r--src/declarative/util/qmlconnection_p.h4
-rw-r--r--src/declarative/util/qmldatetimeformatter_p.h2
-rw-r--r--src/declarative/util/qmleasefollow.cpp2
-rw-r--r--src/declarative/util/qmleasefollow_p.h4
-rw-r--r--src/declarative/util/qmlfontloader.cpp2
-rw-r--r--src/declarative/util/qmlfontloader_p.h2
-rw-r--r--src/declarative/util/qmllistmodel_p.h2
-rw-r--r--src/declarative/util/qmlnumberformatter_p.h2
-rw-r--r--src/declarative/util/qmlpackage_p.h2
-rw-r--r--src/declarative/util/qmlpixmapcache.cpp2
-rw-r--r--src/declarative/util/qmlpropertychanges.cpp8
-rw-r--r--src/declarative/util/qmlspringfollow_p.h4
-rw-r--r--src/declarative/util/qmlstate_p.h2
-rw-r--r--src/declarative/util/qmlstategroup.cpp2
-rw-r--r--src/declarative/util/qmlstateoperations.cpp6
-rw-r--r--src/declarative/util/qmlstateoperations_p.h4
-rw-r--r--src/declarative/util/qmlsystempalette_p.h2
-rw-r--r--src/declarative/util/qmltimer_p.h2
-rw-r--r--src/declarative/util/qmltransition_p.h2
-rw-r--r--src/declarative/util/qmltransitionmanager.cpp2
-rw-r--r--src/declarative/util/qmlview.cpp4
-rw-r--r--src/declarative/util/qmlxmllistmodel.cpp4
-rw-r--r--src/declarative/util/qmlxmllistmodel_p.h4
-rw-r--r--src/declarative/util/qnumberformat_p.h2
-rw-r--r--src/declarative/widgets/graphicswidgets_p.h2
96 files changed, 145 insertions, 145 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
index 655e03d..61b6ecc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
@@ -43,7 +43,7 @@
#include "qmlgraphicsitem.h"
#include "qmlgraphicsitem_p.h"
#include <QDebug>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
index f6e9e1a..bdddafe 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h
@@ -43,8 +43,8 @@
#define QMLGRAPHICSANCHORS_H
#include <QtCore/QObject>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qml.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
index 8c91056..97fdc6a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QMovie>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include "qmlgraphicsanimatedimage_p.h"
#include "qmlgraphicsanimatedimage_p_p.h"
#include <QNetworkRequest>
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index fba9d69..634215e 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
@@ -44,7 +44,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QFile>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
index 9cab18e..567a509 100644
--- a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <QtCore/qobject.h>
#include <QtGui/qevent.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
index 08b0fd8..10447f6 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSFLICKABLE_H
#define QMLGRAPHICSFLICKABLE_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index c61f996..57d2ee1 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -42,7 +42,7 @@
#include "qmlgraphicsflipable_p.h"
#include "private/qmlgraphicsitem_p.h"
#include "QtGui/qgraphicstransform.h"
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
index 23b6c76..8f075ac 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h
@@ -44,7 +44,7 @@
#include <QtCore/QObject>
#include <QtGui/QTransform>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <QtGui/qvector3d.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
index d014da2..d1824e7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSFOCUSPANEL_H
#define QMLGRAPHICSFOCUSPANEL_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
index 813a999..3744240 100644
--- a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSFOCUSSCOPE_H
#define QMLGRAPHICSFOCUSSCOPE_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
index 10f08bd..7d16685 100644
--- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
#define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index e86b53d..0b57540 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -44,7 +44,7 @@
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QFile>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <private/qmlpixmapcache_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
index 0968d99..8144ce0 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSIMAGEBASE_H
#define QMLGRAPHICSIMAGEBASE_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index aa5c4cb..69564c4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -51,7 +51,7 @@
#include <QtGui/qgraphicstransform.h>
#include <QtGui/qgraphicseffect.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <private/qmlopenmetaobject_p.h>
#include <private/qmlstate_p.h>
#include <private/qlistmodelinterface_p.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
index f64964c..2ac43b5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.h
@@ -44,8 +44,8 @@
#include <QtCore/QObject>
#include <QtCore/QList>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <qml.h>
+#include <qmlcomponent.h>
#include <QtGui/qgraphicsitem.h>
#include <QtGui/qgraphicstransform.h>
#include <QtGui/qfont.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
index e1d7342..0c722ac 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
@@ -53,13 +53,13 @@
// We mean it.
//
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <private/qmlstate_p.h>
#include <private/qmlgraphicsanchors_p.h>
#include <private/qmlnullablevalue_p_p.h>
#include <private/qmlgraphicsanchors_p_p.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qml.h>
+#include <qmlcontext.h>
#include <QtCore/qlist.h>
#include <private/qgraphicsitem_p.h>
#include <QtCore/qdebug.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
index ad516b4..bca65fa 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsloader_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSLOADER_H
#define QMLGRAPHICSLOADER_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
index 9c3398a..998183d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSMOUSEREGION_H
#define QMLGRAPHICSMOUSEREGION_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
index 8d629b3..0805330 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSIMAGEITEM_H
#define QMLGRAPHICSIMAGEITEM_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
index 2554605..02c4e6d 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSPARTICLES_H
#define QMLGRAPHICSPARTICLES_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
index 8abfb2a..4b0c772 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h
@@ -44,8 +44,8 @@
#include <QtCore/QObject>
#include <QtGui/QPainterPath>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qml.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
index 59118d4..38f1cd8 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSPATHVIEW_H
#define QMLGRAPHICSPATHVIEW_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <private/qmlgraphicspath_p.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
index 56adc8b..a0665ae 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
@@ -44,7 +44,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <private/qmlstate_p.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
index 2f0a518..fe8c403 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSRECT_H
#define QMLGRAPHICSRECT_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <QtGui/qbrush.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
index 4058df0..c5d0166 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSREPEATER_H
#define QMLGRAPHICSREPEATER_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
index d4ae0a6..82e0a94 100644
--- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h
@@ -45,7 +45,7 @@
#include <QtCore/QString>
#include <QtCore/QObject>
#include <private/qmlpixmapcache_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include "qmlgraphicsborderimage_p.h"
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h
index 31b049a..b6a5932 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h
@@ -42,7 +42,7 @@
#ifndef QMLGRAPHICSTEXT_H
#define QMLGRAPHICSTEXT_H
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
index 3ff2a74..9855867 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qabstractitemmodel.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index bb7ae24..2c03aad 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -46,11 +46,11 @@
#include <QtCore/qstringlist.h>
#include <QtCore/qurl.h>
#include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmllist.h>
+#include <qmlmetatype.h>
+#include <qmlmetaproperty.h>
+#include <qmlparserstatus.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmllist.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index 8814e77..8fbe441 100644
--- a/src/declarative/qml/qmlbinding.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -43,9 +43,9 @@
#define QMLBINDING_H
#include <QtCore/QObject>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qml.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmlexpression.h>
#include <QtCore/QMetaProperty>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h
index e4de239..30a31ab 100644
--- a/src/declarative/qml/qmlbinding_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -53,8 +53,8 @@
// We mean it.
//
-#include <QtDeclarative/qmlbinding.h>
-#include <QtDeclarative/qmlmetaproperty.h>
+#include <qmlbinding.h>
+#include <qmlmetaproperty.h>
#include "qmlexpression_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index 5a00eb2..2cdc07d 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -54,7 +54,7 @@
//
#include <private/qmlexpression_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
index 35679fd..e801892 100644
--- a/src/declarative/qml/qmlboundsignal_p.h
+++ b/src/declarative/qml/qmlboundsignal_p.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
#include <private/qobject_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 81ebd86..2cb44a3 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -69,7 +69,7 @@
#include <private/qmlexpression_p.h>
#include "qmlmetaproperty_p.h"
#include "qmlrewrite_p.h"
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
#include <private/qmlglobal_p.h>
#include "qmlscriptparser_p.h"
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 51c165e..8f28ac9 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -55,8 +55,8 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qset.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qml.h>
+#include <qmlerror.h>
#include <private/qmlinstruction_p.h>
#include <private/qmlcompositetypemanager_p.h>
#include <private/qmlparser_p.h>
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index bfb4d53..835bdc5 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -45,8 +45,8 @@
#include <QtCore/qobject.h>
#include <QtCore/qstring.h>
#include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qml.h>
+#include <qmlerror.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index e69f541..61a8a10 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -60,9 +60,9 @@
#include <private/qmlengine_p.h>
#include <private/qmlcompositetypemanager_p.h>
#include <private/qbitfield_p.h>
-#include <QtDeclarative/qmlerror.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qml.h>
+#include <qmlerror.h>
+#include <qmlcomponent.h>
+#include <qml.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index 3c4982b..7dbe788 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -42,12 +42,12 @@
#include <private/qmlcompositetypedata_p.h>
#include <private/qmlcompositetypemanager_p.h>
#include <private/qmlscriptparser_p.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <QtNetwork/qnetworkreply.h>
#include <private/qmlengine_p.h>
#include <QtCore/qdebug.h>
#include <QtCore/qfile.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <qmlcomponent.h>
#include <private/qmlcomponent_p.h>
#include <private/qmlcompiler_p.h>
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index af028df..0abbfb5 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -56,8 +56,8 @@
#include <QtCore/qglobal.h>
#include <private/qmlscriptparser_p.h>
#include <private/qmlrefcount_p.h>
-#include <QtDeclarative/qmlerror.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlerror.h>
+#include <qmlengine.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 105c673..42f467b 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -49,7 +49,7 @@
#include <QtCore/qdebug.h>
#include <private/qmlbindingoptimizations_p.h>
#include <private/qscriptdeclarativeclass_p.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 22d981f..a9c25a3 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlcontext.h>
#include <private/qobject_p.h>
#include <private/qmldeclarativedata_p.h>
#include <QtCore/qhash.h>
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 74bed25..88a264f 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -55,8 +55,8 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qxmlstream.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlmetatype.h>
+#include <qmlerror.h>
#include <private/qmlparser_p.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index 250307f..ad28d0d 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -44,7 +44,7 @@
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 177818f..6e3cf69 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -86,7 +86,7 @@
#include <private/qmlsqldatabase_p.h>
#include <private/qmltypenamescriptclass_p.h>
#include <private/qmllistscriptclass_p.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
#include <private/qmlglobal_p.h>
#ifdef Q_OS_WIN // for %APPDATA%
@@ -1140,7 +1140,7 @@ QmlEnginePrivate::Imports::~Imports()
delete d;
}
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlmetatype.h>
#include <private/qmltypenamecache_p.h>
static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache)
{
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 3c60b5c..a3e2d52 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -64,12 +64,12 @@
#include <private/qmlclassfactory_p.h>
#include <private/qmlcompositetypemanager_p.h>
#include <private/qpodvector_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <private/qmlbasicscript_p.h>
#include <private/qmlvaluetype_p.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlcontext.h>
+#include <qmlengine.h>
+#include <qmlexpression.h>
#include <QtScript/qscriptengine.h>
#include <private/qmlmetaproperty_p.h>
#include <private/qmlpropertycache_p.h>
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 3813d20..78b166e 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -43,8 +43,8 @@
#include "qmlboundsignal_p.h"
#include <QtCore/qdebug.h>
#include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlengine.h>
+#include <qmlmetatype.h>
#include <qmlmetaproperty.h>
#include <qmlbinding.h>
#include "qmlcontext_p.h"
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 9b123be..cbea58a 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qvariant.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index 9a19b80..7a194e0 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -41,7 +41,7 @@
#include "qmlinfo.h"
#include <private/qmldeclarativedata_p.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlcontext.h>
#include <QtGui/qapplication.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp
index d1927b3..1103ef2 100644
--- a/src/declarative/qml/qmlintegercache.cpp
+++ b/src/declarative/qml/qmlintegercache.cpp
@@ -41,7 +41,7 @@
#include "qmlintegercache_p.h"
#include <private/qmlengine_p.h>
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlmetatype.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index c631d9e..e51b078 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -42,7 +42,7 @@
#ifndef QMLLIST_H
#define QMLLIST_H
-#include <QtDeclarative/qmlprivate.h>
+#include <qmlprivate.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 4ad9aac..8bde318 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -50,7 +50,7 @@
#include "qmlboundsignal_p.h"
#include <math.h>
#include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <private/qmlengine_p.h>
#include <private/qmldeclarativedata_p.h>
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 1f493f8..9a17c34 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -45,10 +45,10 @@
#include <QtCore/qglobal.h>
#include <QtCore/qvariant.h>
#include <QtCore/qbitarray.h>
-#include <QtDeclarative/qmlprivate.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlpropertyvalueinterceptor.h>
+#include <qmlprivate.h>
+#include <qmlparserstatus.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmlpropertyvalueinterceptor.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index c5641e5..1a6f724 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -46,7 +46,7 @@
#include <private/qmldeclarativedata_p.h>
#include <private/qmltypenamescriptclass_p.h>
#include <private/qmllistscriptclass_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
#include <QtCore/qtimer.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 4f080e5..2ece51f 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -56,7 +56,7 @@
#include <QtCore/QByteArray>
#include <QtCore/QList>
#include <QtCore/qstring.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <private/qmlrefcount_p.h>
#include <private/qobject_p.h>
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 339bdef..b7a5fad 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -41,7 +41,7 @@
#include "qmlpropertycache_p.h"
#include <private/qmlengine_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 8ab3b6c..7f9163c 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -57,7 +57,7 @@
#include <QtCore/QObject>
#include <private/qmetaobjectbuilder_p.h>
#include <private/qobject_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index d4cdeda..cb3e9e9 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -54,7 +54,7 @@
#include <QtCore/QList>
#include <QtCore/QUrl>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
#include "qmlparser_p.h"
QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 01d0590..c7d2e12 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtCore/qobject.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <private/qmlengine_p.h>
#include <QtScript/qscriptvalue.h>
#include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index f3d0f65..da09288 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -67,7 +67,7 @@
#include <private/qmlbinding_p.h>
#include <private/qmlcontext_p.h>
#include <private/qmlbindingoptimizations_p.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
index ab58b6a..a15bd08 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -55,7 +55,7 @@
#include <QtCore/QString>
#include <QtCore/QStack>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
#include <private/qbitfield_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
index f2ee09b..f78cfaa 100644
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ b/src/declarative/qml/qmlvmemetaobject_p.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <QtCore/QMetaObject>
#include <QtCore/QBitArray>
#include <QtCore/QPair>
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 2737bf9..889ac78 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -41,10 +41,10 @@
#include <QtCore/qmetaobject.h>
#include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
#include <private/qmldebugservice_p.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qml.h>
+#include <qmlcontext.h>
+#include <qml.h>
#include "qmlwatcher_p.h"
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index a6cdfb1..e5ee2f5 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtCore/qobject.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <private/qmlengine_p.h>
#include <QtScript/qscriptvalue.h>
#include <QtScript/qscriptcontext.h>
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 62d1937..959f38b 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -54,7 +54,7 @@
#include <QtCore/qrect.h>
#include <QtCore/qpoint.h>
#include <QtCore/qsize.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
#include <private/qmlstateoperations_p.h>
#include <private/qmlstringconverters_p.h>
#include <private/qvariantanimation_p.h>
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 3a9839e..0ed5082 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -46,10 +46,10 @@
#include <QtCore/QAbstractAnimation>
#include <QtGui/qcolor.h>
#include <private/qmltransition_p.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
+#include <qmlpropertyvaluesource.h>
#include <private/qmlstate_p.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qml.h>
+#include <qmlscriptstring.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 21c0284..c66fa7a 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -61,8 +61,8 @@
#include <QtCore/QAnimationGroup>
#include <QtGui/QColor>
#include <private/qmlanimation_p.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qml.h>
+#include <qmlcontext.h>
#include <private/qmltimeline_p_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 8364d8c..711c70d 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -43,8 +43,8 @@
#include <private/qmlanimation_p.h>
#include <private/qmltransition_p.h>
#include "qmlbehavior_p.h"
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlcontext.h>
+#include <qmlinfo.h>
#include <QtCore/qparallelanimationgroup.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 9f85f84..b61df32 100644
--- a/src/declarative/util/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
@@ -42,9 +42,9 @@
#ifndef QMLBEHAVIOR_H
#define QMLBEHAVIOR_H
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlpropertyvalueinterceptor.h>
-#include <QtDeclarative/qml.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmlpropertyvalueinterceptor.h>
+#include <qml.h>
#include <private/qmlstate_p.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 86c1b8b..b8ab53e 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlengine.h>
+#include <qmlcontext.h>
#include <private/qobject_p.h>
#include <QtCore/qfile.h>
#include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h
index c3118a3..a9b7b98 100644
--- a/src/declarative/util/qmlbind_p.h
+++ b/src/declarative/util/qmlbind_p.h
@@ -43,7 +43,7 @@
#define QMLBIND_H
#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index db744f6..b1771d4 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -40,10 +40,10 @@
****************************************************************************/
#include "qmlconnection_p.h"
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
#include "private/qmlboundsignal_p.h"
#include "private/qobject_p.h"
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlcontext.h>
#include <QtCore/qdebug.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h
index 7a69771..1bc81fe 100644
--- a/src/declarative/util/qmlconnection_p.h
+++ b/src/declarative/util/qmlconnection_p.h
@@ -44,8 +44,8 @@
#include <QtCore/qobject.h>
#include <QtCore/qstring.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qml.h>
+#include <qmlscriptstring.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h
index e350f96..cd5f75f 100644
--- a/src/declarative/util/qmldatetimeformatter_p.h
+++ b/src/declarative/util/qmldatetimeformatter_p.h
@@ -43,7 +43,7 @@
#define QMLDATETIMEFORMATTER_H
#include <QtCore/qdatetime.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index 6bf3f82..b326f63 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qmleasefollow_p.h"
-#include <QtDeclarative/qmlmetaproperty.h>
+#include <qmlmetaproperty.h>
#include <math.h>
#include <QtCore/qdebug.h>
#include <private/qmlanimation_p_p.h>
diff --git a/src/declarative/util/qmleasefollow_p.h b/src/declarative/util/qmleasefollow_p.h
index 3de72f2..8ea2b8f 100644
--- a/src/declarative/util/qmleasefollow_p.h
+++ b/src/declarative/util/qmleasefollow_p.h
@@ -43,8 +43,8 @@
#define QMLEASEFOLLOW_H
#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
+#include <qml.h>
+#include <qmlpropertyvaluesource.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 36ee1bb..bb26536 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -47,7 +47,7 @@
#include <QNetworkReply>
#include <QFile>
#include <QmlContext>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <QFontDatabase>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h
index d02a181..0202f3c 100644
--- a/src/declarative/util/qmlfontloader_p.h
+++ b/src/declarative/util/qmlfontloader_p.h
@@ -43,7 +43,7 @@
#define QMLFONTLOADER_H
#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index 34b1562..d626060 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -47,7 +47,7 @@
#include <QtCore/QHash>
#include <QtCore/QList>
#include <QtCore/QVariant>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <private/qlistmodelinterface_p.h>
#include <QtScript/qscriptvalue.h>
diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 0036cb9..346c2f0 100644
--- a/src/declarative/util/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
@@ -42,7 +42,7 @@
#ifndef QMLNUMBERFORMATTER_H
#define QMLNUMBERFORMATTER_H
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <private/qnumberformat_p.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlpackage_p.h b/src/declarative/util/qmlpackage_p.h
index abb57c6..ff42aad 100644
--- a/src/declarative/util/qmlpackage_p.h
+++ b/src/declarative/util/qmlpackage_p.h
@@ -42,7 +42,7 @@
#ifndef QMLPACKAGE_H
#define QMLPACKAGE_H
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index f5904c0..ba7895a 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -45,7 +45,7 @@
#include <QNetworkReply>
#include <QPixmapCache>
#include <private/qfxperf_p_p.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
#include <QFile>
#include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 75c9f80..da8aa7e 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -43,12 +43,12 @@
#include "qmlopenmetaobject_p.h"
#include "qmlpropertychanges_p.h"
#include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
#include <private/qmlcustomparser_p.h>
#include <private/qmlparser_p.h>
-#include <QtDeclarative/qmlexpression.h>
-#include <QtDeclarative/qmlbinding.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlexpression.h>
+#include <qmlbinding.h>
+#include <qmlcontext.h>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlspringfollow_p.h b/src/declarative/util/qmlspringfollow_p.h
index b7989e4..7731b9e 100644
--- a/src/declarative/util/qmlspringfollow_p.h
+++ b/src/declarative/util/qmlspringfollow_p.h
@@ -42,8 +42,8 @@
#ifndef QMLSMOOTHFOLLOW_H
#define QMLSMOOTHFOLLOW_H
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qml.h>
+#include <qmlpropertyvaluesource.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index ff42893..50c5401 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/QSequentialAnimationGroup>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 3cfc84a..2d3ca4c 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -42,7 +42,7 @@
#include "private/qobject_p.h"
#include "qmlstategroup_p.h"
#include "qmltransition_p.h"
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
#include <QtCore/qdebug.h>
#include <private/qmlglobal_p.h>
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 03337cb..7e0ac66 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -41,11 +41,11 @@
#include <private/qobject_p.h>
#include <qml.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlcontext.h>
+#include <qmlexpression.h>
#include "qmlstateoperations_p.h"
#include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
#include <private/qmlgraphicsanchors_p_p.h>
#include <private/qmlgraphicsitem_p.h>
#include <QtGui/qgraphicsitem.h>
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
index 861e4d0..a9488dc 100644
--- a/src/declarative/util/qmlstateoperations_p.h
+++ b/src/declarative/util/qmlstateoperations_p.h
@@ -43,9 +43,9 @@
#define QMLSTATEOPERATIONS_H
#include <private/qmlstate_p.h>
-#include <QtDeclarative/qmlgraphicsitem.h>
+#include <qmlgraphicsitem.h>
#include <private/qmlgraphicsanchors_p.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h
index 6abbfe0..8ee511a 100644
--- a/src/declarative/util/qmlsystempalette_p.h
+++ b/src/declarative/util/qmlsystempalette_p.h
@@ -43,7 +43,7 @@
#define QMLSYSTEMPALETTE_H
#include <QtCore/qobject.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <QPalette>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h
index f3037e0..bd96d4a 100644
--- a/src/declarative/util/qmltimer_p.h
+++ b/src/declarative/util/qmltimer_p.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qabstractanimation.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index a7c709f..1891a6e 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -44,7 +44,7 @@
#include <QtCore/qobject.h>
#include <private/qmlstate_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 2cfc6ee..bae7e81 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
#include <private/qmltransitionmanager_p_p.h>
#include <private/qmlstate_p_p.h>
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 0a2cc75..f294d65 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -57,8 +57,8 @@
#include "private/qfxperf_p_p.h"
#include "qmlview.h"
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlengine.h>
+#include <qmlcontext.h>
#include <private/qmldebug_p.h>
#include <private/qmldebugservice_p.h>
#include <QtCore/qabstractanimation.h>
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index 3d90b44..43be9b9 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -42,8 +42,8 @@
#include "qmlxmllistmodel_p.h"
#include "private/qobject_p.h"
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlcontext.h>
+#include <qmlengine.h>
#include <QDebug>
#include <QApplication>
#include <QThread>
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 18bf9d2..2fa1be8 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -42,9 +42,9 @@
#ifndef QMLXMLLISTMODEL_H
#define QMLXMLLISTMODEL_H
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <private/qlistmodelinterface_p.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
QT_BEGIN_HEADER
diff --git a/src/declarative/util/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h
index 1a7b8e4..be3dfce 100644
--- a/src/declarative/util/qnumberformat_p.h
+++ b/src/declarative/util/qnumberformat_p.h
@@ -42,7 +42,7 @@
#ifndef NUMBERFORMAT_H
#define NUMBERFORMAT_H
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <QtCore/QLocale>
#include <QtCore/QTime>
diff --git a/src/declarative/widgets/graphicswidgets_p.h b/src/declarative/widgets/graphicswidgets_p.h
index 2871e5b..0254f10 100644
--- a/src/declarative/widgets/graphicswidgets_p.h
+++ b/src/declarative/widgets/graphicswidgets_p.h
@@ -42,7 +42,7 @@
#ifndef GRAPHICSWIDGETS_H
#define GRAPHICSWIDGETS_H
-#include <QtDeclarative/qml.h>
+#include <qml.h>
#include <QtGui/QGraphicsScene>
#include <QtGui/QGraphicsView>
#include <QtGui/QGraphicsWidget>