Clean up declarative includes

(This commit is in preparation of moving several files
to a separate library (QtQuick2).)

Don't add all subfolders to the includepath (from the
.pri files). There's no good reason to do that.

For headers (both public and private) that are in the
same folder as the file that includes them, prefer to use

 #include "foo.h"
 #include "bar_p.h"

For public headers that are outside the current folder
but have "unambiguous" names (e.g. qdeclarative prefix), use

 #include <foo.h>

For private headers that are outside the current folder, use

 #include <private/baz_p.h>

Also change

 #include <QtDeclarative/private/foo_p.h>

to

 #include <private/foo_p.h>

The header filenames already have a qdeclarative or qsg
prefix; there's no need to prefix by module name to
disambiguate.

Finally,

 #include "private/foo_p.h"

should be avoided. private/ is used for auto-generated
(forwarding) headers, which never reside in the current
(source) directory. Use angle brackets instead.

Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

9 files changed, 21 insertions, 23 deletions

diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri
index 60fe28dd43..31ed75d82a 100644
--- a/src/declarative/items/context2d/context2d.pri
+++ b/src/declarative/items/context2d/context2d.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qsgcanvasitem.cpp \
     $$PWD/qsgcontext2d.cpp \
diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp
index 3445cf01d0..b3b4eab30d 100644
--- a/src/declarative/items/context2d/qsgcanvasitem.cpp
+++ b/src/declarative/items/context2d/qsgcanvasitem.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "private/qsgadaptationlayer_p.h"
+#include <private/qsgadaptationlayer_p.h>
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
+#include <private/qsgitem_p.h>
 #include "qsgcontext2d_p.h"
 #include "qsgcontext2dnode_p.h"
 #include "qsgcontext2dtexture_p.h"
-#include "qdeclarativepixmapcache_p.h"
+#include <private/qdeclarativepixmapcache_p.h>
 
 #include <qdeclarativeinfo.h>
-#include "qdeclarativeengine_p.h"
+#include <private/qdeclarativeengine_p.h>
 #include <QtCore/QBuffer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qsgcanvasitem_p.h
index a2dfb7968a..131a3f5fff 100644
--- a/src/declarative/items/context2d/qsgcanvasitem_p.h
+++ b/src/declarative/items/context2d/qsgcanvasitem_p.h
@@ -42,7 +42,7 @@
 #ifndef QSGCANVASITEM_P_H
 #define QSGCANVASITEM_P_H
 
-#include "qsgitem.h"
+#include <qsgitem.h>
 #include <private/qv8engine_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp
index a1248b856e..e75713de8a 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qsgcontext2d.cpp
@@ -42,24 +42,24 @@
 #include "qsgcontext2d_p.h"
 #include "qsgcontext2dcommandbuffer_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
-#include "qsgshadereffectsource_p.h"
+#include <private/qsgitem_p.h>
+#include <private/qsgshadereffectsource_p.h>
 #include <QtGui/qopenglframebufferobject.h>
 
 #include <QtCore/qdebug.h>
-#include "private/qsgcontext_p.h"
-#include "private/qdeclarativesvgparser_p.h"
-#include "private/qdeclarativepath_p.h"
+#include <private/qsgcontext_p.h>
+#include <private/qdeclarativesvgparser_p.h>
+#include <private/qdeclarativepath_p.h>
 
-#include "private/qsgimage_p_p.h"
+#include <private/qsgimage_p_p.h>
 
 #include <QtGui/qguiapplication.h>
 #include <qdeclarativeinfo.h>
 #include <QtCore/qmath.h>
-#include "qv8engine_p.h"
+#include <private/qv8engine_p.h>
 
-#include "qdeclarativeengine.h"
-#include "qv8domerrors_p.h"
+#include <qdeclarativeengine.h>
+#include <private/qv8domerrors_p.h>
 #include <QtCore/qnumeric.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
index dff4f9fe75..9dff4e809e 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
@@ -41,7 +41,7 @@
 
 #include "qsgcontext2dcommandbuffer_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qdeclarative.h"
+#include <qdeclarative.h>
 #include <QtCore/QMutex>
 
 #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))
diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
index 95d0e9685e..cab82e2f67 100644
--- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
@@ -43,7 +43,7 @@
 #define QSGCONTEXT2DCOMMANDBUFFER_P_H
 
 #include "qsgcontext2d_p.h"
-#include "qdeclarativepixmapcache_p.h"
+#include <private/qdeclarativepixmapcache_p.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qsgcontext2dnode_p.h
index 957c14b138..88c3619095 100644
--- a/src/declarative/items/context2d/qsgcontext2dnode_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dnode_p.h
@@ -42,8 +42,8 @@
 #ifndef QSGCONTEXT2DNODE_P_H
 #define QSGCONTEXT2DNODE_P_H
 
-#include "qsgnode.h"
-#include "qsgtexturematerial.h"
+#include <qsgnode.h>
+#include <qsgtexturematerial.h>
 
 #include "qsgcanvasitem_p.h"
 #include "qsgcontext2dtexture_p.h"
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
index 8e22cebe70..a57a5e5fba 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp
+++ b/src/declarative/items/context2d/qsgcontext2dtexture.cpp
@@ -42,8 +42,8 @@
 #include "qsgcontext2dtexture_p.h"
 #include "qsgcontext2dtile_p.h"
 #include "qsgcanvasitem_p.h"
-#include "qsgitem_p.h"
-#include "private/qsgtexture_p.h"
+#include <private/qsgitem_p.h>
+#include <private/qsgtexture_p.h>
 #include "qsgcontext2dcommandbuffer_p.h"
 #include <QOpenGLPaintDevice>
 
diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qsgcontext2dtexture_p.h
index 1555120320..dbc383d7fc 100644
--- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h
+++ b/src/declarative/items/context2d/qsgcontext2dtexture_p.h
@@ -42,7 +42,7 @@
 #ifndef QSGCONTEXT2DTEXTURE_P_H
 #define QSGCONTEXT2DTEXTURE_P_H
 
-#include "qsgtexture.h"
+#include <qsgtexture.h>
 #include "qsgcanvasitem_p.h"
 #include "qsgcontext2d_p.h"