replace system with local header inclusions where applicable

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

src/core/concurrent/qfuturewatcher_p.h

@@ -50,7 +50,7 @@
 
 #ifndef QT_NO_QFUTURE
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/global/qglobal.cpp

@@ -41,7 +41,7 @@
 #include "qcorecommon_p.h"
 
 #ifndef QT_NO_QOBJECT
-#include <qthread_p.h>
+#include "qthread_p.h"
 #endif
 
 #include <stdio.h>

src/core/io/qabstractfileengine.cpp

@@ -40,9 +40,9 @@
 #include "qfsfileengine.h"
 #include "qdiriterator.h"
 
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
-#include <qfilesystemengine_p.h>
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
+#include "qfilesystemengine_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qdiriterator.cpp

@@ -83,19 +83,16 @@
 
 #include "qdiriterator.h"
 #include "qdir_p.h"
-
 #include "qabstractfileengine.h"
-
-#include <QtCore/qset.h>
-#include <QtCore/qstack.h>
-#include <QtCore/qvariant.h>
-
-#include <qfilesystemiterator_p.h>
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
-#include <qfilesystemengine_p.h>
-#include <QtCore/qfsfileengine.h>
-#include <qfileinfo_p.h>
+#include "qset.h"
+#include "qstack.h"
+#include "qvariant.h"
+#include "qfilesystemiterator_p.h"
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
+#include "qfilesystemengine_p.h"
+#include "qfsfileengine.h"
+#include "qfileinfo_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfileinfo_p.h

@@ -48,8 +48,8 @@
 #include "qshareddata.h"
 #include "qfilesystemengine_p.h"
 
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystemengine.cpp

@@ -32,11 +32,11 @@
 ****************************************************************************/
 
 #include "qfilesystemengine_p.h"
-#include <QtCore/qdir.h>
-#include <QtCore/qset.h>
-#include <qabstractfileengine_p.h>
+#include "qdir.h"
+#include "qset.h"
+#include "qabstractfileengine_p.h"
 #ifdef QT_BUILD_CORE_LIB
-#include <qresource_p.h>
+#include "qresource_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE

src/core/io/qfilesystemengine_p.h

@@ -48,7 +48,7 @@
 #include "qfile.h"
 #include "qfilesystementry_p.h"
 #include "qfilesystemmetadata_p.h"
-#include <qsystemerror_p.h>
+#include "qsystemerror_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystementry.cpp

@@ -32,10 +32,9 @@
 ****************************************************************************/
 
 #include "qfilesystementry_p.h"
-
-#include <QtCore/qdir.h>
-#include <QtCore/qfile.h>
-#include <qfsfileengine_p.h>
+#include "qdir.h"
+#include "qfile.h"
+#include "qfsfileengine_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystementry_p.h

@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <QtCore/qstring.h>
+#include "qstring.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystemiterator_p.h

@@ -45,16 +45,15 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_FILESYSTEMITERATOR
 
-#include <QtCore/qdiriterator.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qscopedpointer.h>
-
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
+#include "qdiriterator.h"
+#include "qstringlist.h"
+#include "qscopedpointer.h"
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystemwatcher_p.h

@@ -49,7 +49,7 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 #include <QtCore/qstringlist.h>
 

src/core/io/qprocess.cpp

@@ -41,7 +41,7 @@
 #include "qcoreapplication.h"
 #include "qsocketnotifier.h"
 #include "qtimer.h"
-#include <qcore_unix_p.h>
+#include "qcore_unix_p.h"
 
 //#define QPROCESS_DEBUG
 

src/core/io/qprocess_unix.cpp

@@ -39,8 +39,8 @@
 #include "qprocess.h"
 #include "qprocess_p.h"
 #include "qcore_unix_p.h"
-#include <qcoreapplication_p.h>
-#include <qthread_p.h>
+#include "qcoreapplication_p.h"
+#include "qthread_p.h"
 #include "qfile.h"
 #include "qfileinfo.h"
 #include "qlist.h"

src/core/io/qstandardpaths_unix.cpp

@@ -29,10 +29,11 @@
 #include "qfile.h"
 #include "qhash.h"
 #include "qtextstream.h"
-#include <qfilesystemengine_p.h>
+#include "qfilesystemengine_p.h"
+#include "qcoreapplication.h"
+
 #include <errno.h>
 #include <stdlib.h>
-#include "qcoreapplication.h"
 
 #ifndef QT_NO_STANDARDPATHS
 

src/core/json/qjson.cpp

@@ -23,7 +23,7 @@
 *
 ***********************************************************************/
 
-#include <qjson_p.h>
+#include "qjson_p.h"
 #include "qalgorithms.h"
 
 QT_BEGIN_NAMESPACE

src/core/json/qjsonarray.cpp

@@ -30,9 +30,8 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qdebug.h"
-
-#include <qjsonwriter_p.h>
-#include <qjson_p.h>
+#include "qjsonwriter_p.h"
+#include "qjson_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/json/qjsondocument.cpp

@@ -30,9 +30,9 @@
 #include "qstringlist.h"
 #include "qvariant.h"
 #include "qdebug.h"
-#include <qjsonwriter_p.h>
-#include <qjsonparser_p.h>
-#include <qjson_p.h>
+#include "qjsonwriter_p.h"
+#include "qjsonparser_p.h"
+#include "qjson_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/json/qjsonobject.cpp

@@ -29,8 +29,8 @@
 #include "qstringlist.h"
 #include "qdebug.h"
 #include "qvariant.h"
-#include <qjson_p.h>
-#include <qjsonwriter_p.h>
+#include "qjson_p.h"
+#include "qjsonwriter_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/json/qjsonparser.cpp

@@ -25,8 +25,8 @@
 
 #include "qcoreapplication.h"
 #include "qdebug.h"
-#include <qjsonparser_p.h>
-#include <qjson_p.h>
+#include "qjsonparser_p.h"
+#include "qjson_p.h"
 
 //#define PARSER_DEBUG
 #ifdef PARSER_DEBUG

src/core/json/qjsonvalue.cpp

@@ -31,8 +31,7 @@
 #include "qvariant.h"
 #include "qstringlist.h"
 #include "qdebug.h"
-
-#include <qjson_p.h>
+#include "qjson_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/json/qjsonwriter.cpp

@@ -23,8 +23,8 @@
 *
 ***********************************************************************/
 
-#include <qjsonwriter_p.h>
-#include <qjson_p.h>
+#include "qjsonwriter_p.h"
+#include "qjson_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qabstracteventdispatcher.cpp

@@ -35,8 +35,8 @@
 #include "qabstracteventdispatcher_p.h"
 
 #include "qthread.h"
-#include <qthread_p.h>
-#include <qcoreapplication_p.h>
+#include "qthread_p.h"
+#include "qcoreapplication_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qabstractitemmodel.cpp

@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 #include "qabstractitemmodel.h"
-#include <qabstractitemmodel_p.h>
+#include "qabstractitemmodel_p.h"
 #include "qdatastream.h"
 #include "qstringlist.h"
 #include "qsize.h"

src/core/kernel/qcoreapplication.cpp

@@ -44,17 +44,17 @@
 #include "qfile.h"
 #include "qfileinfo.h"
 #include "qhash.h"
-#include <qprocess_p.h>
+#include "qprocess_p.h"
 #include "qtextcodec.h"
 #include "qthread.h"
 #include "qthreadpool.h"
-#include <qthread_p.h>
+#include "qthread_p.h"
 #include "qelapsedtimer.h"
 #include "qlibraryinfo.h"
 #include "qvarlengtharray.h"
-#include <qfactoryloader_p.h>
-#include <qlocale_p.h>
-#include <qmutexpool_p.h>
+#include "qfactoryloader_p.h"
+#include "qlocale_p.h"
+#include "qmutexpool_p.h"
 #include "qscopedpointer.h"
 
 #if !defined(QT_NO_GLIB)

src/core/kernel/qeventdispatcher_glib.cpp

@@ -34,8 +34,8 @@
 #include "qeventdispatcher_glib_p.h"
 #include "qeventdispatcher_unix_p.h"
 
-#include <qmutexpool_p.h>
-#include <qthread_p.h>
+#include "qmutexpool_p.h"
+#include "qthread_p.h"
 
 #include "qcoreapplication.h"
 #include "qsocketnotifier.h"

src/core/kernel/qeventdispatcher_unix.cpp

@@ -38,9 +38,9 @@
 #include "qthread.h"
 #include "qelapsedtimer.h"
 #include "qeventdispatcher_unix_p.h"
-#include <qthread_p.h>
-#include <qcoreapplication_p.h>
-#include <qcore_unix_p.h>
+#include "qthread_p.h"
+#include "qcoreapplication_p.h"
+#include "qcore_unix_p.h"
 
 #include <errno.h>
 #include <stdio.h>

src/core/kernel/qeventloop.cpp

@@ -32,13 +32,11 @@
 ****************************************************************************/
 
 #include "qeventloop.h"
-
 #include "qabstracteventdispatcher.h"
 #include "qcoreapplication.h"
 #include "qelapsedtimer.h"
-
 #include "qobject_p.h"
-#include <qthread_p.h>
+#include "qthread_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qeventloop.h

@@ -34,7 +34,7 @@
 #ifndef QEVENTLOOP_H
 #define QEVENTLOOP_H
 
-#include <QtCore/qobject.h>
+#include "qobject.h"
 
 QT_BEGIN_HEADER
 

src/core/kernel/qmetaobject_p.h

@@ -46,10 +46,10 @@
 //
 
 #include "qobjectdefs.h"
-#include <qcorecommon_p.h>
+#include "qcorecommon_p.h"
 
 #ifndef QT_NO_QOBJECT
-#  include <qobject_p.h>
+#  include "qobject_p.h"
 #endif
 
 #ifndef QT_NO_COMPRESS

src/core/kernel/qobject.cpp

@@ -34,7 +34,6 @@
 #include "qobject.h"
 #include "qobject_p.h"
 #include "qmetaobject_p.h"
-
 #include "qabstracteventdispatcher.h"
 #include "qcoreapplication.h"
 #include "qcoreapplication_p.h"
@@ -42,19 +41,17 @@
 #include "qmetaobject.h"
 #include "qregexp.h"
 #include "qthread.h"
-#include <qthread_p.h>
+#include "qthread_p.h"
 #include "qdebug.h"
 #include "qhash.h"
 #include "qpair.h"
 #include "qset.h"
 #include "qsemaphore.h"
 #include "qsharedpointer.h"
-
-#include <qorderedmutexlocker_p.h>
-#include <qmutexpool_p.h>
+#include "qorderedmutexlocker_p.h"
+#include "qmutexpool_p.h"
 
 #include <new>
-
 #include <ctype.h>
 #include <limits.h>
 

src/core/kernel/qsocketnotifier.cpp

@@ -37,7 +37,7 @@
 #include "qcoreapplication.h"
 
 #include "qobject_p.h"
-#include <qthread_p.h>
+#include "qthread_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/thread/qthread_unix.cpp

@@ -41,7 +41,7 @@
 #if !defined(QT_NO_GLIB)
 #  include "../kernel/qeventdispatcher_glib_p.h"
 #endif
-#include <qeventdispatcher_unix_p.h>
+#include "qeventdispatcher_unix_p.h"
 
 #include <sched.h>
 #include <errno.h>

src/core/tools/qstring.cpp

@@ -37,7 +37,7 @@
 #ifndef QT_NO_TEXTCODEC
 #include "qtextcodec.h"
 #endif
-#include <qutfcodec_p.h>
+#include "qutfcodec_p.h"
 #include "qdatastream.h"
 #include "qlist.h"
 #include "qlocale.h"

src/core/tools/qtimeline.cpp

@@ -33,7 +33,7 @@
 
 #include "qtimeline.h"
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qelapsedtimer.h>

src/dbus/qdbuspendingcall.cpp

@@ -46,7 +46,7 @@
 #include "qdbusmetatype_p.h"
 #include "qcoreapplication.h"
 #include "qcoreevent.h"
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 
 QT_BEGIN_NAMESPACE

src/dbus/qdbusservicewatcher.cpp

@@ -44,7 +44,7 @@
 
 #include <QStringList>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 #include <dbus/dbus.h>
 

src/dbus/qdbusunixfiledescriptor.cpp

@@ -44,7 +44,7 @@
 #include <QSharedData>
 
 #ifdef Q_OS_UNIX
-# include <qcore_unix_p.h>
+# include "qcore_unix_p.h"
 #endif
 
 

src/declarative/graphicsitems/qdeclarativeanchors_p.h

@@ -40,7 +40,7 @@
 
 #include <QtCore/QObject>
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativeanchors_p_p.h

@@ -47,7 +47,7 @@
 
 #include "qdeclarativeanchors_p.h"
 #include "qdeclarativeitemchangelistener_p.h"
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp

@@ -45,7 +45,7 @@
 #ifndef QT_NO_MOVIE
 
 #include "qdeclarativeinfo.h"
-#include <qdeclarativeengine_p.h>
+#include "qdeclarativeengine_p.h"
 
 #include <QMovie>
 #include <QNetworkRequest>

src/declarative/graphicsitems/qdeclarativeborderimage.cpp

@@ -43,7 +43,7 @@
 #include "qdeclarativeborderimage_p_p.h"
 
 #include "qdeclarativeinfo.h"
-#include <qdeclarativeengine_p.h>
+#include "qdeclarativeengine_p.h"
 
 #include <QNetworkRequest>
 #include <QNetworkReply>

src/declarative/graphicsitems/qdeclarativeflickable_p_p.h

@@ -51,8 +51,8 @@
 #include "qdeclarativeitemchangelistener_p.h"
 
 #include "qdeclarative.h"
-#include <qdeclarativetimeline_p_p.h>
-#include <qdeclarativeanimation_p_p.h>
+#include "qdeclarativetimeline_p_p.h"
+#include "qdeclarativeanimation_p_p.h"
 
 #include "qdatetime.h"
 #include "qplatformdefs.h"

src/declarative/graphicsitems/qdeclarativegridview.cpp

@@ -45,9 +45,9 @@
 #include "qdeclarativeflickable_p_p.h"
 
 #include "qdeclarativesmoothedanimation_p_p.h"
-#include <qdeclarativeguard_p.h>
+#include "qdeclarativeguard_p.h"
 
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <QEvent>
 
 #include "qmath.h"

src/declarative/graphicsitems/qdeclarativeimagebase.cpp

@@ -44,7 +44,7 @@
 
 #include "qdeclarativeengine.h"
 #include "qdeclarativeinfo.h"
-#include <qdeclarativepixmapcache_p.h>
+#include "qdeclarativepixmapcache_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativeitem.cpp

@@ -42,15 +42,15 @@
 #include "qdeclarativeitem.h"
 
 #include "qdeclarativeevents_p_p.h"
-#include <qdeclarativeengine_p.h>
-#include <qgraphicsitem_p.h>
-#include <qdeclarativeitem_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qgraphicsitem_p.h"
+#include "qdeclarativeitem_p.h"
 
 #include "qdeclarativeengine.h"
-#include <qdeclarativeopenmetaobject_p.h>
-#include <qdeclarativestate_p.h>
+#include "qdeclarativeopenmetaobject_p.h"
+#include "qdeclarativestate_p.h"
 #include "qdeclarativeview.h"
-#include <qdeclarativestategroup_p.h>
+#include "qdeclarativestategroup_p.h"
 #include "qdeclarativecomponent.h"
 #include "qdeclarativeinfo.h"
 
@@ -61,7 +61,7 @@
 #include <QtCore/qnumeric.h>
 #include <QtScript/qscriptengine.h>
 #include <QtGui/qgraphicstransform.h>
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 
 #include <float.h>
 

src/declarative/graphicsitems/qdeclarativeitem_p.h

@@ -50,12 +50,12 @@
 #include "qdeclarativeanchors_p.h"
 #include "qdeclarativeanchors_p_p.h"
 #include "qdeclarativeitemchangelistener_p.h"
-#include <qpodvector_p.h>
+#include "qpodvector_p.h"
 
-#include <qdeclarativestate_p.h>
-#include <qdeclarativenullablevalue_p_p.h>
-#include <qdeclarativenotifier_p.h>
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativestate_p.h"
+#include "qdeclarativenullablevalue_p_p.h"
+#include "qdeclarativenotifier_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
@@ -63,7 +63,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 
-#include <qgraphicsitem_p.h>
+#include "qgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativelistview.cpp

@@ -47,10 +47,10 @@
 #include "qdeclarativesmoothedanimation_p_p.h"
 #include "qdeclarativeexpression.h"
 #include "qdeclarativeengine.h"
-#include <qdeclarativeguard_p.h>
+#include "qdeclarativeguard_p.h"
 #include "qdeclarativeinfo.h"
 
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include "qmath.h"
 #include <QEvent>
 #include "qplatformdefs.h"

src/declarative/graphicsitems/qdeclarativeloader.cpp

@@ -42,8 +42,8 @@
 #include "qdeclarativeloader_p_p.h"
 
 #include "qdeclarativeinfo.h"
-#include <qdeclarativeengine_p.h>
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativepath.cpp

@@ -45,7 +45,7 @@
 #include <QSet>
 #include <QDateTime>
 
-#include <qbezier_p.h>
+#include "qbezier_p.h"
 #include <QtCore/qmath.h>
 #include <QtCore/qnumeric.h>
 

src/declarative/graphicsitems/qdeclarativepath_p_p.h

@@ -49,7 +49,7 @@
 
 #include "qdeclarative.h"
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 class QDeclarativePathPrivate : public QObjectPrivate

src/declarative/graphicsitems/qdeclarativepathview.cpp

@@ -42,11 +42,11 @@
 #include "qdeclarativepathview_p.h"
 #include "qdeclarativepathview_p_p.h"
 
-#include <qdeclarativestate_p.h>
-#include <qdeclarativeopenmetaobject_p.h>
+#include "qdeclarativestate_p.h"
+#include "qdeclarativeopenmetaobject_p.h"
 #include <QDebug>
 #include <QEvent>
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <QGraphicsSceneEvent>
 
 #include "qmath.h"

src/declarative/graphicsitems/qdeclarativepathview_p_p.h

@@ -51,8 +51,8 @@
 #include "qdeclarativevisualitemmodel_p.h"
 
 #include "qdeclarative.h"
-#include <qdeclarativeanimation_p_p.h>
-#include <qdeclarativeguard_p.h>
+#include "qdeclarativeanimation_p_p.h"
+#include "qdeclarativeguard_p.h"
 
 #include "qdatetime.h"
 

src/declarative/graphicsitems/qdeclarativepositioners.cpp

@@ -43,9 +43,9 @@
 #include "qdeclarativepositioners_p_p.h"
 
 #include "qdeclarative.h"
-#include <qdeclarativestate_p.h>
-#include <qdeclarativestategroup_p.h>
-#include <qdeclarativestateoperations_p.h>
+#include "qdeclarativestate_p.h"
+#include "qdeclarativestategroup_p.h"
+#include "qdeclarativestateoperations_p.h"
 #include "qdeclarativeinfo.h"
 #include <QtCore/qmath.h>
 

src/declarative/graphicsitems/qdeclarativepositioners_p.h

@@ -36,8 +36,8 @@
 
 #include "qdeclarativeimplicitsizeitem_p.h"
 
-#include <qdeclarativestate_p.h>
-#include <qpodvector_p.h>
+#include "qdeclarativestate_p.h"
+#include "qpodvector_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QString>

src/declarative/graphicsitems/qdeclarativepositioners_p_p.h

@@ -49,9 +49,9 @@
 
 #include "qdeclarativeimplicitsizeitem_p_p.h"
 
-#include <qdeclarativestate_p.h>
-#include <qdeclarativetransitionmanager_p_p.h>
-#include <qdeclarativestateoperations_p.h>
+#include "qdeclarativestate_p.h"
+#include "qdeclarativetransitionmanager_p_p.h"
+#include "qdeclarativestateoperations_p.h"
 
 #include <QtCore/QObject>
 #include <QtCore/QString>

src/declarative/graphicsitems/qdeclarativerectangle_p.h

@@ -38,7 +38,7 @@
 
 #include <QtGui/qbrush.h>
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativerepeater.cpp

@@ -43,10 +43,10 @@
 #include "qdeclarativerepeater_p_p.h"
 
 #include "qdeclarativevisualitemmodel_p.h"
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativelistaccessor_p.h>
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativelistaccessor_p.h"
 
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 
 QT_BEGIN_NAMESPACE
 QDeclarativeRepeaterPrivate::QDeclarativeRepeaterPrivate()

src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h

@@ -39,9 +39,9 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-#include <qdeclarativeborderimage_p.h>
-#include <qdeclarativepixmapcache_p.h>
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeborderimage_p.h"
+#include "qdeclarativepixmapcache_p.h"
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativetext.cpp

@@ -41,9 +41,9 @@
 
 #include "qdeclarativetext_p.h"
 #include "qdeclarativetext_p_p.h"
-#include <qdeclarativestyledtext_p.h>
+#include "qdeclarativestyledtext_p.h"
 #include "qdeclarativeinfo.h"
-#include <qdeclarativepixmapcache_p.h>
+#include "qdeclarativepixmapcache_p.h"
 
 #include <QSet>
 #include <QTextLayout>

src/declarative/graphicsitems/qdeclarativetext_p.h

@@ -37,7 +37,7 @@
 #include <QtGui/qtextoption.h>
 #include "qdeclarativeimplicitsizeitem_p.h"
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativetextedit.cpp

@@ -43,12 +43,12 @@
 #include "qdeclarativetextedit_p_p.h"
 
 #include "qdeclarativeevents_p_p.h"
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 #include "qdeclarativeinfo.h"
 
 #include <QtCore/qmath.h>
 
-#include <qtextengine_p.h>
+#include "qtextengine_p.h"
 #include <QTextLayout>
 #include <QTextDocument>
 #include <QTextObject>
@@ -56,7 +56,7 @@
 #include <QDebug>
 #include <QPainter>
 
-#include <qtextcontrol_p.h>
+#include "qtextcontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativetextinput.cpp

@@ -42,7 +42,7 @@
 #include "qdeclarativetextinput_p.h"
 #include "qdeclarativetextinput_p_p.h"
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 #include "qdeclarativeinfo.h"
 
 #include <QValidator>

src/declarative/graphicsitems/qdeclarativetranslate.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qdeclarativetranslate_p.h"
-#include <qgraphicstransform_p.h>
+#include "qgraphicstransform_p.h"
 #include <QDebug>
 #include <QtCore/qmath.h>
 

src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp

@@ -45,26 +45,26 @@
 #include "qdeclarativecommon_p.h"
 
 #include "qdeclarativecontext.h"
-#include <qdeclarativecontext_p.h>
+#include "qdeclarativecontext_p.h"
 #include "qdeclarativeengine.h"
 #include "qdeclarativeexpression.h"
-#include <qdeclarativepackage_p.h>
-#include <qdeclarativeopenmetaobject_p.h>
-#include <qdeclarativelistaccessor_p.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 "qdeclarativedata_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeguard_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include "qgraphicsscene.h"
-#include <qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include "qhash.h"
 #include "qlist.h"
-#include <qmetaobjectbuilder_p.h>
+#include "qmetaobjectbuilder_p.h"
 #include <QtCore/qdebug.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeboundsignal_p.h

@@ -50,7 +50,7 @@
 
 #include <QtCore/qmetaobject.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativecompiledbindings.cpp

@@ -45,16 +45,16 @@
 #include "qdeclarativecompiledbindings_p.h"
 
 #include <QtDeclarative/qdeclarativeinfo.h>
-#include <qdeclarativecontext_p.h>
-#include <qdeclarativejsast_p.h>
-#include <qdeclarativejsengine_p.h>
-#include <qdeclarativeexpression_p.h>
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativejsast_p.h"
+#include "qdeclarativejsengine_p.h"
+#include "qdeclarativeexpression_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qnumeric.h>
-#include <qdeclarativeanchors_p_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativefastproperties_p.h>
+#include "qdeclarativeanchors_p_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativefastproperties_p.h"
 #include "qdeclarativecommon_p.h"
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativecompileddata.cpp

@@ -48,7 +48,7 @@
 
 #include <QtCore/qdebug.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativecompiler.cpp

@@ -2678,7 +2678,7 @@ bool QDeclarativeCompiler::checkValidId(QDeclarativeParser::Value *v, const QStr
     return true;
 }
 
-#include <qdeclarativejsparser_p.h>
+#include "qdeclarativejsparser_p.h"
 
 static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node)
 {

src/declarative/qml/qdeclarativecomponent_p.h

@@ -56,7 +56,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QList>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativecontext.cpp

@@ -52,7 +52,7 @@
 #include "qscriptengine.h"
 #include "qdebug.h"
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativecontext_p.h

@@ -58,7 +58,7 @@
 #include <QtScript/qscriptvalue.h>
 #include <QtCore/qset.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 #include "qdeclarativeguard_p.h"
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativecontextscriptclass_p.h

@@ -46,7 +46,7 @@
 //
 
 #include "qdeclarativetypenamecache_p.h"
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativedata_p.h

@@ -46,7 +46,7 @@
 //
 
 #include <QtScript/qscriptvalue.h>
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativedirparser.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativedirparser_p.h"
 #include "qdeclarativeerror.h"
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 #include <QtCore/QTextStream>
 #include <QtCore/QFile>

src/declarative/qml/qdeclarativeengine.cpp

@@ -92,10 +92,10 @@
 #include <QVector3D>
 #include <QCryptographicHash>
 
-#include <qobject_p.h>
-#include <qscriptdeclarativeclass_p.h>
-#include <qdeclarativeitemsmodule_p.h>
-#include <qdeclarativeutilmodule_p.h>
+#include "qobject_p.h"
+#include "qscriptdeclarativeclass_p.h"
+#include "qdeclarativeitemsmodule_p.h"
+#include "qdeclarativeutilmodule_p.h"
 
 Q_DECLARE_METATYPE(QDeclarativeProperty)
 

src/declarative/qml/qdeclarativeengine_p.h

@@ -74,7 +74,7 @@
 #include <QtCore/qmutex.h>
 #include <QtScript/qscriptengine.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeexpression.cpp

@@ -51,7 +51,7 @@
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptprogram.h>
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativefastproperties.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativefastproperties_p.h"
 
-#include <qdeclarativeitem_p.h>
+#include "qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeglobalscriptclass.cpp

@@ -47,7 +47,7 @@
 #include <QtScript/qscriptengine.h>
 #include <QtScript/qscriptvalueiterator.h>
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeguard_p.h

@@ -45,9 +45,8 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
-#include <QtCore/qvariant.h>
-#include <qdeclarativedata_p.h>
+#include "qvariant.h"
+#include "qdeclarativedata_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeimport.cpp

@@ -48,9 +48,9 @@
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qalgorithms.h>
 #include <QtDeclarative/qdeclarativeextensioninterface.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativetypenamecache_p.h>
-#include <qdeclarativeengine_p.h>
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativetypenamecache_p.h"
+#include "qdeclarativeengine_p.h"
 
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativeimport_p.h

@@ -37,9 +37,9 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qset.h>
-#include <qdeclarativedirparser_p.h>
-#include <qdeclarativescriptparser_p.h>
-#include <qdeclarativemetatype_p.h>
+#include "qdeclarativedirparser_p.h"
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativemetatype_p.h"
 
 //
 //  W A R N I N G

src/declarative/qml/qdeclarativeinclude.cpp

@@ -46,8 +46,8 @@
 #include <QtNetwork/qnetworkreply.h>
 #include <QtCore/qfile.h>
 
-#include <qdeclarativeengine_p.h>
-#include <qdeclarativeglobalscriptclass_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativeglobalscriptclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeinclude_p.h

@@ -49,8 +49,8 @@
 #include <QtCore/qurl.h>
 #include <QtScript/qscriptvalue.h>
 
-#include <qdeclarativecontext_p.h>
-#include <qdeclarativeguard_p.h>
+#include "qdeclarativecontext_p.h"
+#include "qdeclarativeguard_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeintegercache_p.h

@@ -50,7 +50,7 @@
 
 #include <QtCore/qhash.h>
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativelistscriptclass_p.h

@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 #include "qdeclarativelist.h"
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativemetatype_p.h

@@ -50,8 +50,8 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qbitarray.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativedirparser_p.h>
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativedirparser_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeobjectscriptclass_p.h

@@ -48,7 +48,7 @@
 #include "qdeclarativepropertycache_p.h"
 #include "qdeclarativetypenamecache_p.h"
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 #include <QtScript/qscriptengine.h>
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativeparser_p.h

@@ -53,9 +53,9 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qstringlist.h>
 
-#include <qobject_p.h>
-#include <qdeclarativerefcount_p.h>
-#include <qdeclarativeglobal_p.h>
+#include "qobject_p.h"
+#include "qdeclarativerefcount_p.h"
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/qml/qdeclarativeproperty_p.h

@@ -47,10 +47,10 @@
 
 #include "qdeclarativeproperty.h"
 
-#include <qobject_p.h>
-#include <qdeclarativeglobal_p.h>
-#include <qdeclarativepropertycache_p.h>
-#include <qdeclarativeguard_p.h>
+#include "qobject_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativepropertycache_p.h"
+#include "qdeclarativeguard_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativeproxymetaobject_p.h

@@ -51,7 +51,7 @@
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 QT_BEGIN_HEADER
 

src/declarative/qml/qdeclarativestringconverters_p.h

@@ -48,7 +48,7 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativetypeloader.cpp

@@ -41,10 +41,10 @@
 
 #include "qdeclarativetypeloader_p.h"
 
-#include <qdeclarativeengine_p.h>
-#include <qdeclarativecompiler_p.h>
-#include <qdeclarativecomponent_p.h>
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeengine_p.h"
+#include "qdeclarativecompiler_p.h"
+#include "qdeclarativecomponent_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtCore/qdebug.h>

src/declarative/qml/qdeclarativetypeloader_p.h

@@ -49,9 +49,9 @@
 #include <QtNetwork/qnetworkreply.h>
 #include <QtDeclarative/qdeclarativeerror.h>
 #include <QtDeclarative/qdeclarativeengine.h>
-#include <qdeclarativescriptparser_p.h>
-#include <qdeclarativedirparser_p.h>
-#include <qdeclarativeimport_p.h>
+#include "qdeclarativescriptparser_p.h"
+#include "qdeclarativedirparser_p.h"
+#include "qdeclarativeimport_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativetypenamecache_p.h

@@ -48,7 +48,7 @@
 #include "qdeclarativerefcount_p.h"
 #include "qdeclarativecleanup_p.h"
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativetypenamescriptclass_p.h

@@ -46,7 +46,7 @@
 //
 #include "qdeclarativeengine_p.h"
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 #include <QtScript/qscriptclass.h>
 
 QT_BEGIN_NAMESPACE

src/declarative/qml/qdeclarativevaluetypescriptclass_p.h

@@ -46,7 +46,7 @@
 //
 
 
-#include <qscriptdeclarativeclass_p.h>
+#include "qscriptdeclarativeclass_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/qml/qdeclarativevmemetaobject_p.h

@@ -55,7 +55,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 
-#include <qobject_p.h>
+#include "qobject_p.h"
 
 #include "qdeclarativeguard_p.h"
 #include "qdeclarativecompiler_p.h"

src/declarative/qml/qmetaobjectbuilder_p.h

@@ -50,7 +50,7 @@
 #include <QtCore/qdatastream.h>
 #include <QtCore/qmap.h>
 
-#include <qdeclarativeglobal_p.h>
+#include "qdeclarativeglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 

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 "qdeclarativestringconverters_p.h"
+#include "qdeclarativeglobal_p.h"
+#include "qdeclarativemetatype_p.h"
+#include "qdeclarativevaluetype_p.h"
+#include "qdeclarativeproperty_p.h"
+#include "qdeclarativeengine_p.h"
 
 #include "qvariant.h"
 #include "qcolor.h"
@@ -68,7 +68,7 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qmath.h>
 
-#include <qvariantanimation_p.h>
+#include "qvariantanimation_p.h"
 
 QT_BEGIN_NAMESPACE