From 7fa3aa4d48c3b7d9bf17b6135bc6bdeb62e899d2 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 12 Oct 2011 08:26:22 +0200
Subject: Clean up declarative includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(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>
---
 src/declarative/util/util.pri | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/declarative/util/util.pri')

diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index ae67a8618d..1d71225bf5 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,5 +1,3 @@
-INCLUDEPATH += $$PWD
-
 SOURCES += \
     $$PWD/qdeclarativeapplication.cpp \
     $$PWD/qdeclarativeutilmodule.cpp\
-- 
cgit v1.2.3