replace system with local header inclusions where applicable

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

src/3rdparty/javascriptcore/wtf/Platform.h

@@ -27,7 +27,7 @@
 #ifndef WTF_Platform_h
 #define WTF_Platform_h
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 QT_USE_NAMESPACE
 

src/core/codecs/qiconvcodec.cpp

@@ -33,8 +33,8 @@
 
 #include "qiconvcodec_p.h"
 #include "qtextcodec_p.h"
-#include <qlibrary.h>
-#include <qdebug.h>
+#include "qlibrary.h"
+#include "qdebug.h"
 
 #include <errno.h>
 #include <locale.h>

src/core/concurrent/qfuturewatcher_p.h

@@ -46,7 +46,7 @@
 //
 
 #include "qfutureinterface_p.h"
-#include <qlist.h>
+#include "qlist.h"
 
 #ifndef QT_NO_QFUTURE
 

src/core/io/qdatastream_p.h

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

src/core/io/qfilesystemwatcher.cpp

@@ -36,12 +36,12 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qdatetime.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qset.h>
-#include <qtimer.h>
+#include "qdatetime.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qfileinfo.h"
+#include "qset.h"
+#include "qtimer.h"
 
 #if defined(Q_OS_LINUX)
 #  include "qfilesystemwatcher_inotify_p.h"

src/core/io/qfilesystemwatcher_dnotify.cpp

@@ -37,14 +37,14 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qsocketnotifier.h>
-#include <qcoreapplication.h>
-#include <qfileinfo.h>
-#include <qthread.h>
-#include <qtimer.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
-#include <qdir.h>
+#include "qsocketnotifier.h"
+#include "qcoreapplication.h"
+#include "qfileinfo.h"
+#include "qthread.h"
+#include "qtimer.h"
+#include "qwaitcondition.h"
+#include "qmutex.h"
+#include "qdir.h"
 
 #include <dirent.h>
 #include <sys/types.h>

src/core/io/qfilesystemwatcher_dnotify_p.h

@@ -49,10 +49,10 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qmutex.h>
-#include <qhash.h>
-#include <qdatetime.h>
-#include <qfile.h>
+#include "qmutex.h"
+#include "qhash.h"
+#include "qdatetime.h"
+#include "qfile.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qfilesystemwatcher_inotify.cpp

@@ -38,11 +38,11 @@
 
 #include "qcore_unix_p.h"
 
-#include <qdebug.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qsocketnotifier.h>
-#include <qvarlengtharray.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qsocketnotifier.h"
+#include "qvarlengtharray.h"
 
 #include <sys/syscall.h>
 #include <sys/ioctl.h>

src/core/io/qfilesystemwatcher_kqueue.cpp

@@ -39,9 +39,9 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qdebug.h>
-#include <qfile.h>
-#include <qsocketnotifier.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qsocketnotifier.h"
 
 #include <sys/types.h>
 #include <sys/event.h>

src/core/io/qfsfileengine_p.h

@@ -46,12 +46,11 @@
 //
 
 #include "qplatformdefs.h"
-#include "QtCore/qfsfileengine.h"
+#include "qfsfileengine.h"
 #include "qabstractfileengine_p.h"
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
-#include <qhash.h>
-
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
+#include "qhash.h"
 
 #ifndef QT_NO_FSFILEENGINE
 

src/core/io/qnoncontiguousbytedevice.cpp

@@ -32,9 +32,9 @@
 ****************************************************************************/
 
 #include "qnoncontiguousbytedevice_p.h"
-#include <qbuffer.h>
-#include <qdebug.h>
-#include <qfile.h>
+#include "qbuffer.h"
+#include "qdebug.h"
+#include "qfile.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/io/qprocess.cpp

@@ -34,13 +34,13 @@
 
 #include "qprocess.h"
 #include "qprocess_p.h"
-#include <qdebug.h>
-#include <qstring.h>
-#include <qbytearray.h>
-#include <qelapsedtimer.h>
-#include <qcoreapplication.h>
-#include <qsocketnotifier.h>
-#include <qtimer.h>
+#include "qdebug.h"
+#include "qstring.h"
+#include "qbytearray.h"
+#include "qelapsedtimer.h"
+#include "qcoreapplication.h"
+#include "qsocketnotifier.h"
+#include "qtimer.h"
 #include <qcore_unix_p.h>
 
 //#define QPROCESS_DEBUG

src/core/io/qprocess_unix.cpp

@@ -41,15 +41,15 @@
 #include "qcore_unix_p.h"
 #include <qcoreapplication_p.h>
 #include <qthread_p.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qlist.h>
-#include <qhash.h>
-#include <qmutex.h>
-#include <qsemaphore.h>
-#include <qsocketnotifier.h>
-#include <qthread.h>
-#include <qelapsedtimer.h>
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qlist.h"
+#include "qhash.h"
+#include "qmutex.h"
+#include "qsemaphore.h"
+#include "qsocketnotifier.h"
+#include "qthread.h"
+#include "qelapsedtimer.h"
 
 #include <errno.h>
 #include <stdlib.h>

src/core/io/qresource.cpp

@@ -43,7 +43,7 @@
 #include "qdatetime.h"
 #include "qbytearray.h"
 #include "qstringlist.h"
-#include <qshareddata.h>
+#include "qshareddata.h"
 #include <qplatformdefs.h>
 #include "qabstractfileengine_p.h"
 #include "qcore_unix_p.h"

src/core/io/qsettings.cpp

@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qplatformdefs.h"
 #include "qsettings.h"
 

src/core/io/qstandardpaths.cpp

@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qstandardpaths.h>
+#include "qstandardpaths.h"
 
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qhash.h>
-#include <qobject.h>
-#include <qcoreapplication.h>
+#include "qdir.h"
+#include "qfileinfo.h"
+#include "qhash.h"
+#include "qobject.h"
+#include "qcoreapplication.h"
 
 #ifndef QT_NO_STANDARDPATHS
 

src/core/io/qstandardpaths_unix.cpp

@@ -24,15 +24,15 @@
 *
 ***********************************************************************/
 
-#include <qstandardpaths.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qhash.h>
-#include <qtextstream.h>
+#include "qstandardpaths.h"
+#include "qdir.h"
+#include "qfile.h"
+#include "qhash.h"
+#include "qtextstream.h"
 #include <qfilesystemengine_p.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <qcoreapplication.h>
+#include "qcoreapplication.h"
 
 #ifndef QT_NO_STANDARDPATHS
 

src/core/json/qjson.cpp

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

src/core/json/qjson_p.h

@@ -26,14 +26,14 @@
 #ifndef QJSON_P_H
 #define QJSON_P_H
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsondocument.h>
-#include <qjsonarray.h>
-#include <qatomic.h>
-#include <qstring.h>
-#include <qendian.h>
-#include <qnumeric.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsondocument.h"
+#include "qjsonarray.h"
+#include "qatomic.h"
+#include "qstring.h"
+#include "qendian.h"
+#include "qnumeric.h"
 #include <limits.h>
 #include <limits>
 

src/core/json/qjsonarray.cpp

@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qjsonvalue.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdebug.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qjsonvalue.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdebug.h"
 
 #include <qjsonwriter_p.h>
 #include <qjson_p.h>

src/core/json/qjsondocument.cpp

@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qjsondocument.h>
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdebug.h>
+#include "qjsondocument.h"
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdebug.h"
 #include <qjsonwriter_p.h>
 #include <qjsonparser_p.h>
 #include <qjson_p.h>

src/core/json/qjsonobject.cpp

@@ -23,12 +23,12 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qstringlist.h>
-#include <qdebug.h>
-#include <qvariant.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qstringlist.h"
+#include "qdebug.h"
+#include "qvariant.h"
 #include <qjson_p.h>
 #include <qjsonwriter_p.h>
 

src/core/json/qjsonobject.h

@@ -26,7 +26,7 @@
 #ifndef QJSONOBJECT_H
 #define QJSONOBJECT_H
 
-#include <qjsonvalue.h>
+#include "qjsonvalue.h"
 #include <QtCore/qcontainerfwd.h>
 #include <QtCore/qiterator.h>
 

src/core/json/qjsonparser.cpp

@@ -23,8 +23,8 @@
 *
 ***********************************************************************/
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
 #include <qjsonparser_p.h>
 #include <qjson_p.h>
 

src/core/json/qjsonparser_p.h

@@ -26,8 +26,8 @@
 #ifndef QJSONPARSER_P_H
 #define QJSONPARSER_P_H
 
-#include <qjsondocument.h>
-#include <qvarlengtharray.h>
+#include "qjsondocument.h"
+#include "qvarlengtharray.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/json/qjsonvalue.cpp

@@ -24,13 +24,13 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qjsonarray.h>
-#include <qvariant.h>
-#include <qstringlist.h>
-#include <qdebug.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qjsonarray.h"
+#include "qvariant.h"
+#include "qstringlist.h"
+#include "qdebug.h"
 
 #include <qjson_p.h>
 

src/core/json/qjsonwriter_p.h

@@ -26,7 +26,7 @@
 #ifndef QJSONWRITER_P_H
 #define QJSONWRITER_P_H
 
-#include <qjsonvalue.h>
+#include "qjsonvalue.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qabstractitemmodel.cpp

@@ -33,14 +33,14 @@
 
 #include "qabstractitemmodel.h"
 #include <qabstractitemmodel_p.h>
-#include <qdatastream.h>
-#include <qstringlist.h>
-#include <qsize.h>
-#include <qmimedata.h>
-#include <qdebug.h>
-#include <qvector.h>
-#include <qstack.h>
-#include <qbitarray.h>
+#include "qdatastream.h"
+#include "qstringlist.h"
+#include "qsize.h"
+#include "qmimedata.h"
+#include "qdebug.h"
+#include "qvector.h"
+#include "qstack.h"
+#include "qbitarray.h"
 
 #include <limits.h>
 

src/core/kernel/qcoreapplication.cpp

@@ -38,24 +38,24 @@
 #include "qcoreevent.h"
 #include "qeventloop.h"
 #include "qcorecmdlineargs_p.h"
-#include <qdatastream.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qhash.h>
+#include "qdatastream.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qhash.h"
 #include <qprocess_p.h>
-#include <qtextcodec.h>
-#include <qthread.h>
-#include <qthreadpool.h>
+#include "qtextcodec.h"
+#include "qthread.h"
+#include "qthreadpool.h"
 #include <qthread_p.h>
-#include <qelapsedtimer.h>
-#include <qlibraryinfo.h>
-#include <qvarlengtharray.h>
+#include "qelapsedtimer.h"
+#include "qlibraryinfo.h"
+#include "qvarlengtharray.h"
 #include <qfactoryloader_p.h>
 #include <qlocale_p.h>
 #include <qmutexpool_p.h>
-#include <qscopedpointer.h>
+#include "qscopedpointer.h"
 
 #if !defined(QT_NO_GLIB)
 #  include "qeventdispatcher_glib_p.h"

src/core/kernel/qmetaobject.cpp

@@ -35,16 +35,16 @@
 #include "qmetatype.h"
 #include "qobject.h"
 
-#include <qcoreapplication.h>
-#include <qcoreevent.h>
-#include <qdatastream.h>
-#include <qstringlist.h>
-#include <qthread.h>
-#include <qvarlengtharray.h>
-#include <qvariant.h>
-#include <qhash.h>
-#include <qdebug.h>
-#include <qsemaphore.h>
+#include "qcoreapplication.h"
+#include "qcoreevent.h"
+#include "qdatastream.h"
+#include "qstringlist.h"
+#include "qthread.h"
+#include "qvarlengtharray.h"
+#include "qvariant.h"
+#include "qhash.h"
+#include "qdebug.h"
+#include "qsemaphore.h"
 
 #include "qobject_p.h"
 #include "qmetaobject_p.h"

src/core/kernel/qmetaobject_p.h

@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qobjectdefs.h>
+#include "qobjectdefs.h"
 #include <qcorecommon_p.h>
 
 #ifndef QT_NO_QOBJECT

src/core/kernel/qobject.cpp

@@ -40,15 +40,15 @@
 #include "qcoreapplication_p.h"
 #include "qvariant.h"
 #include "qmetaobject.h"
-#include <qregexp.h>
-#include <qthread.h>
+#include "qregexp.h"
+#include "qthread.h"
 #include <qthread_p.h>
-#include <qdebug.h>
-#include <qhash.h>
-#include <qpair.h>
-#include <qset.h>
-#include <qsemaphore.h>
-#include <qsharedpointer.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>

src/core/kernel/qsharedmemory.cpp

@@ -34,9 +34,9 @@
 #include "qsharedmemory.h"
 #include "qsharedmemory_p.h"
 #include "qsystemsemaphore.h"
-#include <qdir.h>
-#include <qcryptographichash.h>
-#include <qdebug.h>
+#include "qdir.h"
+#include "qcryptographichash.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qsharedmemory_unix.cpp

@@ -36,8 +36,8 @@
 #include "qsharedmemory.h"
 #include "qsharedmemory_p.h"
 
-#include <qdebug.h>
-#include <qfile.h>
+#include "qdebug.h"
+#include "qfile.h"
 
 #ifndef QT_NO_SHAREDMEMORY
 #include <sys/types.h>

src/core/kernel/qsystemerror_p.h

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

src/core/kernel/qsystemsemaphore.cpp

@@ -33,7 +33,6 @@
 
 #include "qsystemsemaphore.h"
 #include "qsystemsemaphore_p.h"
-#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/core/kernel/qsystemsemaphore_unix.cpp

@@ -34,9 +34,9 @@
 #include "qsystemsemaphore.h"
 #include "qsystemsemaphore_p.h"
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qfile.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
+#include "qfile.h"
 
 #ifndef QT_NO_SYSTEMSEMAPHORE
 

src/core/plugin/qfactoryloader.cpp

@@ -36,9 +36,9 @@
 #ifndef QT_NO_LIBRARY
 #include "qfactoryinterface.h"
 #include "qmap.h"
-#include <qdir.h>
-#include <qsettings.h>
-#include <qdebug.h>
+#include "qdir.h"
+#include "qsettings.h"
+#include "qdebug.h"
 #include "qmutex.h"
 #include "qplugin.h"
 #include "qpluginloader.h"

src/core/plugin/qlibrary.cpp

@@ -39,20 +39,19 @@
 #ifndef QT_NO_LIBRARY
 
 #include "qlibrary_p.h"
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qmutex.h>
-#include <qmap.h>
-#include <qsettings.h>
-#include <qdatetime.h>
-#include <qcoreapplication_p.h>
-#ifndef NO_ERRNO_H
+#include "qstringlist.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qmutex.h"
+#include "qmap.h"
+#include "qsettings.h"
+#include "qdatetime.h"
+#include "qcoreapplication_p.h"
+#include "qdebug.h"
+#include "qvector.h"
+#include "qdir.h"
+
 #include <errno.h>
-#endif // NO_ERROR_H
-#include <qdebug.h>
-#include <qvector.h>
-#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 

src/core/plugin/qlibrary_unix.cpp

@@ -33,11 +33,11 @@
 
 #include "qplatformdefs.h"
 
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qlibrary_p.h>
-#include <qcoreapplication.h>
-#include <qfilesystementry_p.h>
+#include "qfile.h"
+#include "qstringlist.h"
+#include "qlibrary_p.h"
+#include "qcoreapplication.h"
+#include "qfilesystementry_p.h"
 
 #ifndef QT_NO_LIBRARY
 

src/core/plugin/qpluginloader.cpp

@@ -35,7 +35,7 @@
 
 #include "qplugin.h"
 #include "qpluginloader.h"
-#include <qfileinfo.h>
+#include "qfileinfo.h"
 #include "qlibrary_p.h"
 #include "qdebug.h"
 #include "qdir.h"

src/core/tools/qbitarray.cpp

@@ -32,8 +32,8 @@
 ****************************************************************************/
 
 #include "qbitarray.h"
-#include <qdatastream.h>
-#include <qdebug.h>
+#include "qdatastream.h"
+#include "qdebug.h"
 #include <string.h>
 
 QT_BEGIN_NAMESPACE

src/core/tools/qbytedata_p.h

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

src/core/tools/qcommandlineoption.cpp

@@ -28,8 +28,8 @@
 ** Copyright (C) 2013 David Faure <faure@kde.org>
 *****************************************************/
 
-#include <qcommandlineoption.h>
-#include <qset.h>
+#include "qcommandlineoption.h"
+#include "qset.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/tools/qcommandlineparser.cpp

@@ -28,11 +28,11 @@
 ** Copyright (C) 2013 David Faure <faure@kde.org>
 *****************************************************/
 
-#include <qcommandlineparser.h>
+#include "qcommandlineparser.h"
+#include "qcoreapplication.h"
+#include "qhash.h"
+#include "qvector.h"
 
-#include <qcoreapplication.h>
-#include <qhash.h>
-#include <qvector.h>
 #include <stdio.h>
 #include <stdlib.h>
 

src/core/tools/qcryptographichash.cpp

@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include <qcryptographichash.h>
-#include <qiodevice.h>
+#include "qcryptographichash.h"
+#include "qiodevice.h"
 
 #include <openssl/md5.h>
 #include <openssl/md4.h>

src/core/tools/qhash.cpp

@@ -32,13 +32,10 @@
 ****************************************************************************/
 
 #include "qhash.h"
+#include "qbitarray.h"
+#include "qstring.h"
 
-#include <qbitarray.h>
-#include <qstring.h>
 #include <stdlib.h>
-#ifdef QT_QHASH_DEBUG
-#include <qstring.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 

src/core/tools/qline.cpp

@@ -35,7 +35,7 @@
 #include "qdebug.h"
 #include "qdatastream.h"
 #include "qmath.h"
-#include <qnumeric.h>
+#include "qnumeric.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/tools/qmap.cpp

@@ -36,8 +36,8 @@
 #include <stdlib.h>
 
 #ifdef QT_QMAP_DEBUG
-# include <qstring.h>
-# include <qvector.h>
+# include "qstring.h"
+# include "qvector.h"
 #endif
 
 QT_BEGIN_NAMESPACE

src/core/tools/qshareddata.cpp

@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include <qshareddata.h>
+#include "qshareddata.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/tools/qsharedpointer.cpp

@@ -1166,8 +1166,8 @@
     compile. Use qSharedPointerConstCast to cast away the constness.
 */
 
-#include <qset.h>
-#include <qmutex.h>
+#include "qset.h"
+#include "qmutex.h"
 
 #if !defined(QT_NO_QOBJECT)
 #include "qobject_p.h"

src/core/tools/qstring.cpp

@@ -35,11 +35,11 @@
 #include "qregexp.h"
 #include "qunicodetables_p.h"
 #ifndef QT_NO_TEXTCODEC
-#include <qtextcodec.h>
+#include "qtextcodec.h"
 #endif
 #include <qutfcodec_p.h>
-#include <qdatastream.h>
-#include <qlist.h>
+#include "qdatastream.h"
+#include "qlist.h"
 #include "qlocale.h"
 #include "qlocale_p.h"
 #include "qlocale_tools_p.h"

src/core/tools/qstringlist.cpp

@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include <qstringlist.h>
-#include <qset.h>
+#include "qstringlist.h"
+#include "qset.h"
 
 QT_BEGIN_NAMESPACE
 

src/core/tools/qtextboundaryfinder.cpp

@@ -30,8 +30,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtCore/qtextboundaryfinder.h>
-#include <qdebug.h>
+
+#include "qtextboundaryfinder.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 

src/dbus/qdbusabstractadaptor.cpp

@@ -40,15 +40,12 @@
 ****************************************************************************/
 
 #include "qdbusabstractadaptor.h"
-
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qset.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qthread.h>
-
+#include "qcoreapplication.h"
+#include "qmetaobject.h"
+#include "qset.h"
+#include "qtimer.h"
+#include "qthread.h"
 #include "qdbusconnection.h"
-
 #include "qdbusconnection_p.h"  // for qDBusParametersForMethod
 #include "qdbusabstractadaptor_p.h"
 #include "qdbusmetatype_p.h"

src/dbus/qdbusabstractadaptor_p.h

@@ -46,7 +46,7 @@
 #ifndef QDBUSABSTRACTADAPTORPRIVATE_H
 #define QDBUSABSTRACTADAPTORPRIVATE_H
 
-#include <qdbusabstractadaptor.h>
+#include "qdbusabstractadaptor.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qmap.h>

src/dbus/qdbusabstractinterface.cpp

@@ -42,7 +42,7 @@
 #include "qdbusabstractinterface.h"
 #include "qdbusabstractinterface_p.h"
 
-#include <qthread.h>
+#include "qthread.h"
 
 #include "qdbusargument.h"
 #include "qdbuspendingcall.h"
@@ -51,7 +51,7 @@
 #include "qdbusmetatype_p.h"
 #include "qdbusutil_p.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 
 QT_BEGIN_NAMESPACE

src/dbus/qdbusabstractinterface_p.h

@@ -46,9 +46,9 @@
 #ifndef QDBUSABSTRACTINTERFACEPRIVATE_H
 #define QDBUSABSTRACTINTERFACEPRIVATE_H
 
-#include <qdbusabstractinterface.h>
-#include <qdbusconnection.h>
-#include <qdbuserror.h>
+#include "qdbusabstractinterface.h"
+#include "qdbusconnection.h"
+#include "qdbuserror.h"
 #include "qdbusconnection_p.h"
 #include "qobject_p.h"
 

src/dbus/qdbusargument.cpp

@@ -41,16 +41,16 @@
 
 #include "qdbusargument.h"
 
-#include <qatomic.h>
-#include <qbytearray.h>
-#include <qlist.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qrect.h>
-#include <qline.h>
+#include "qatomic.h"
+#include "qbytearray.h"
+#include "qlist.h"
+#include "qmap.h"
+#include "qstring.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qrect.h"
+#include "qline.h"
 
 #include "qdbusargument_p.h"
 #include "qdbusmetatype_p.h"

src/dbus/qdbusargument_p.h

@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdbusargument.h>
+#include "qdbusargument.h"
 #include "qdbusunixfiledescriptor.h"
 
 #include <dbus/dbus.h>

src/dbus/qdbusconnection.cpp

@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
-#include <qcoreapplication.h>
-#include <qstringlist.h>
-#include <qthread.h>
+#include "qdebug.h"
+#include "qcoreapplication.h"
+#include "qstringlist.h"
+#include "qthread.h"
 
 #include "qdbusconnection.h"
 #include "qdbusconnectioninterface.h"

src/dbus/qdbusconnection_p.h

@@ -46,9 +46,9 @@
 #ifndef QDBUSCONNECTION_P_H
 #define QDBUSCONNECTION_P_H
 
-#include <qdbuserror.h>
-#include <qdbusconnection.h>
-#include <qdbusmessage.h>
+#include "qdbuserror.h"
+#include "qdbusconnection.h"
+#include "qdbusmessage.h"
 
 #include <QtCore/qatomic.h>
 #include <QtCore/qhash.h>

src/dbus/qdbuserror.cpp

@@ -40,9 +40,7 @@
 ****************************************************************************/
 
 #include "qdbuserror.h"
-
-#include <qdebug.h>
-
+#include "qdebug.h"
 #include "qdbusmessage.h"
 #include "qdbusmessage_p.h"
 

src/dbus/qdbusintegrator.cpp

@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qmetaobject.h>
-#include <qobject.h>
-#include <qsocketnotifier.h>
-#include <qstringlist.h>
-#include <qtimer.h>
-#include <qthread.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
+#include "qmetaobject.h"
+#include "qobject.h"
+#include "qsocketnotifier.h"
+#include "qstringlist.h"
+#include "qtimer.h"
+#include "qthread.h"
 
 #include "qdbusargument.h"
 #include "qdbusconnection_p.h"

src/dbus/qdbusinterface_p.h

@@ -48,7 +48,7 @@
 
 #include "qdbusabstractinterface_p.h"
 #include "qdbusmetaobject_p.h"
-#include <qdbusinterface.h>
+#include "qdbusinterface.h"
 
 
 QT_BEGIN_NAMESPACE

src/dbus/qdbusmessage.cpp

@@ -40,10 +40,8 @@
 ****************************************************************************/
 
 #include "qdbusmessage.h"
-
-#include <qdebug.h>
-#include <qstringlist.h>
-
+#include "qdebug.h"
+#include "qstringlist.h"
 #include "qdbusargument_p.h"
 #include "qdbuserror.h"
 #include "qdbusmessage_p.h"

src/dbus/qdbusmessage_p.h

@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qatomic.h>
-#include <qstring.h>
-#include <qdbusmessage.h>
-#include <qdbusconnection.h>
+#include "qatomic.h"
+#include "qstring.h"
+#include "qdbusmessage.h"
+#include "qdbusconnection.h"
 
 struct DBusMessage;
 

src/dbus/qdbusmetatype.cpp

@@ -40,14 +40,9 @@
 ****************************************************************************/
 
 #include "qdbusmetatype.h"
-
-#include <string.h>
-
-#include <qbytearray.h>
-#include <qglobal.h>
-#include <qreadwritelock.h>
-#include <qvector.h>
-
+#include "qbytearray.h"
+#include "qreadwritelock.h"
+#include "qvector.h"
 #include "qdbusmessage.h"
 #include "qdbusunixfiledescriptor.h"
 #include "qdbusutil_p.h"
@@ -55,6 +50,7 @@
 #include "qdbusargument_p.h"
 
 #include <dbus/dbus.h>
+#include <string.h>
 
 #ifndef DBUS_TYPE_UNIX_FD
 # define DBUS_TYPE_UNIX_FD int('h')

src/dbus/qdbusmetatype_p.h

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

src/dbus/qdbuspendingcall_p.h

@@ -46,12 +46,11 @@
 #ifndef QDBUSPENDINGCALL_P_H
 #define QDBUSPENDINGCALL_P_H
 
-#include <qshareddata.h>
-#include <qpointer.h>
-#include <qlist.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
-
+#include "qshareddata.h"
+#include "qpointer.h"
+#include "qlist.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
 #include "qdbusmessage.h"
 
 #include <dbus/dbus.h>

src/declarative/graphicsitems/qdeclarativeanchors.cpp

@@ -43,8 +43,7 @@
 
 #include "qdeclarativeitem.h"
 #include "qdeclarativeitem_p.h"
-
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QDebug>
 

src/declarative/graphicsitems/qdeclarativeanchors_p.h

@@ -36,7 +36,7 @@
 
 #include "qdeclarativeitem.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QObject>
 

src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp

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

src/declarative/graphicsitems/qdeclarativeborderimage.cpp

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

src/declarative/graphicsitems/qdeclarativeevents_p_p.h

@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>

src/declarative/graphicsitems/qdeclarativeflickable.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativeflickable_p.h"
 #include "qdeclarativeflickable_p_p.h"
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <QGraphicsSceneEvent>
 #include <QPointer>
 #include <QTimer>

src/declarative/graphicsitems/qdeclarativeflickable_p_p.h

@@ -50,11 +50,11 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativeitemchangelistener_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativetimeline_p_p.h>
 #include <qdeclarativeanimation_p_p.h>
 
-#include <qdatetime.h>
+#include "qdatetime.h"
 #include "qplatformdefs.h"
 
 QT_BEGIN_NAMESPACE

src/declarative/graphicsitems/qdeclarativeflipable.cpp

@@ -44,7 +44,7 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativeguard_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QtGui/qgraphicstransform.h>
 

src/declarative/graphicsitems/qdeclarativegridview.cpp

@@ -50,7 +50,7 @@
 #include <qlistmodelinterface_p.h>
 #include <QEvent>
 
-#include <qmath.h>
+#include "qmath.h"
 #include <math.h>
 #include "qplatformdefs.h"
 

src/declarative/graphicsitems/qdeclarativeimagebase.cpp

@@ -42,8 +42,8 @@
 #include "qdeclarativeimagebase_p.h"
 #include "qdeclarativeimagebase_p_p.h"
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeengine.h"
+#include "qdeclarativeinfo.h"
 #include <qdeclarativepixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE

src/declarative/graphicsitems/qdeclarativeitem.cpp

@@ -46,13 +46,13 @@
 #include <qgraphicsitem_p.h>
 #include <qdeclarativeitem_p.h>
 
-#include <qdeclarativeengine.h>
+#include "qdeclarativeengine.h"
 #include <qdeclarativeopenmetaobject_p.h>
 #include <qdeclarativestate_p.h>
-#include <qdeclarativeview.h>
+#include "qdeclarativeview.h"
 #include <qdeclarativestategroup_p.h>
-#include <qdeclarativecomponent.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativecomponent.h"
+#include "qdeclarativeinfo.h"
 
 #include <QDebug>
 #include <QPen>

src/declarative/graphicsitems/qdeclarativeitem_p.h

@@ -57,8 +57,8 @@
 #include <qdeclarativenotifier_p.h>
 #include <qdeclarativeglobal_p.h>
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
 
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>

src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h

@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEITEMMODULE_H
 #define QDECLARATIVEITEMMODULE_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativelistview.cpp

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

src/declarative/graphicsitems/qdeclarativeloader.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativeloader_p_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeengine_p.h>
 #include <qdeclarativeglobal_p.h>
 

src/declarative/graphicsitems/qdeclarativemousearea_p_p.h

@@ -47,9 +47,9 @@
 
 #include "qdeclarativeitem_p.h"
 
-#include <qdatetime.h>
-#include <qbasictimer.h>
-#include <qgraphicssceneevent.h>
+#include "qdatetime.h"
+#include "qbasictimer.h"
+#include "qgraphicssceneevent.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativepainteditem.cpp

@@ -49,7 +49,7 @@
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QPaintEngine>
-#include <qmath.h>
+#include "qmath.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativepath_p.h

@@ -36,7 +36,7 @@
 
 #include "qdeclarativeitem.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QObject>
 #include <QtGui/QPainterPath>

src/declarative/graphicsitems/qdeclarativepath_p_p.h

@@ -47,7 +47,7 @@
 
 #include "qdeclarativepath_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <qobject_p.h>
 

src/declarative/graphicsitems/qdeclarativepathview.cpp

@@ -49,7 +49,7 @@
 #include <qlistmodelinterface_p.h>
 #include <QGraphicsSceneEvent>
 
-#include <qmath.h>
+#include "qmath.h"
 #include <math.h>
 
 QT_BEGIN_NAMESPACE

src/declarative/graphicsitems/qdeclarativepathview_p_p.h

@@ -50,11 +50,11 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativevisualitemmodel_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativeanimation_p_p.h>
 #include <qdeclarativeguard_p.h>
 
-#include <qdatetime.h>
+#include "qdatetime.h"
 
 QT_BEGIN_NAMESPACE
 

src/declarative/graphicsitems/qdeclarativepincharea_p.h

@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEPINCHAREA_H
 #define QDECLARATIVEPINCHAREA_H
 
-#include <qdeclarativeitem.h>
+#include "qdeclarativeitem.h"
 
 QT_BEGIN_HEADER
 

src/declarative/graphicsitems/qdeclarativepincharea_p_p.h

@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qdatetime.h>
-#include <qbasictimer.h>
-#include <qevent.h>
-#include <qgraphicssceneevent.h>
+#include "qdatetime.h"
+#include "qbasictimer.h"
+#include "qevent.h"
+#include "qgraphicssceneevent.h"
 #include "qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE

src/declarative/graphicsitems/qdeclarativepositioners.cpp

@@ -42,11 +42,11 @@
 #include "qdeclarativepositioners_p.h"
 #include "qdeclarativepositioners_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativestate_p.h>
 #include <qdeclarativestategroup_p.h>
 #include <qdeclarativestateoperations_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <QtCore/qmath.h>
 
 #include <QDebug>

src/declarative/graphicsitems/qdeclarativescalegrid.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativescalegrid_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QBuffer>
 #include <QDebug>

src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h

@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVESCALEGRID_H
 #define QDECLARATIVESCALEGRID_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QString>
 #include <QtCore/QObject>

src/declarative/graphicsitems/qdeclarativetext.cpp

@@ -42,7 +42,7 @@
 #include "qdeclarativetext_p.h"
 #include "qdeclarativetext_p_p.h"
 #include <qdeclarativestyledtext_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativepixmapcache_p.h>
 
 #include <QSet>
@@ -51,7 +51,7 @@
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QAbstractTextDocumentLayout>
-#include <qmath.h>
+#include "qmath.h"
 #include <limits.h>
 
 QT_BEGIN_NAMESPACE

src/declarative/graphicsitems/qdeclarativetext_p_p.h

@@ -47,7 +47,7 @@
 
 #include "qdeclarativeitem.h"
 #include "qdeclarativeimplicitsizeitem_p_p.h"
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtGui/qtextlayout.h>
 

src/declarative/graphicsitems/qdeclarativetextedit.cpp

@@ -44,7 +44,7 @@
 
 #include "qdeclarativeevents_p_p.h"
 #include <qdeclarativeglobal_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QtCore/qmath.h>
 

src/declarative/graphicsitems/qdeclarativetextedit_p_p.h

@@ -48,7 +48,7 @@
 #include "qdeclarativeitem.h"
 #include "qdeclarativeimplicitsizeitem_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_NAMESPACE
 class QTextLayout;