fix include style and remove subsequently redundant INCLUDEPATHs

Change-Id: I9e6950d30c7a65229559c7046a7cc8c903964065
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

8 files changed, 6 insertions, 8 deletions

diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp
index 9d81422f0e..31af2a84d4 100644
--- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp
+++ b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.cpp
@@ -29,7 +29,8 @@
 
 
 #include "cplusplus-tools-utils.h"
-#include "environment.h"
+
+#include <utils/environment.h>
 
 #include <QDebug>
 #include <QDir>
diff --git a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri
index c84010be2c..4982a84335 100644
--- a/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri
+++ b/src/tools/cplusplus-tools-utils/cplusplus-tools-utils.pri
@@ -1,5 +1,5 @@
 DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD $$PWD/../../libs/utils
+INCLUDEPATH += $$PWD
 
 DEFINES *= QT_NO_CAST_FROM_ASCII
 DEFINES += PATH_PREPROCESSOR_CONFIG=\\\"$$PWD/pp-configuration.inc\\\"
diff --git a/tests/auto/aggregation/aggregation.pro b/tests/auto/aggregation/aggregation.pro
index 6ba9d92b06..ceac55227b 100644
--- a/tests/auto/aggregation/aggregation.pro
+++ b/tests/auto/aggregation/aggregation.pro
@@ -1,5 +1,4 @@
 QT -= gui
 include(../qttest.pri)
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/aggregation
 include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri)
 SOURCES += tst_aggregate.cpp
diff --git a/tests/auto/aggregation/tst_aggregate.cpp b/tests/auto/aggregation/tst_aggregate.cpp
index ec879ba26a..7539c31a08 100644
--- a/tests/auto/aggregation/tst_aggregate.cpp
+++ b/tests/auto/aggregation/tst_aggregate.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <aggregate.h>
+#include <aggregation/aggregate.h>
 
 #include <QtTest>
 
diff --git a/tests/auto/filesearch/filesearch.pro b/tests/auto/filesearch/filesearch.pro
index b8759f8645..9307837739 100644
--- a/tests/auto/filesearch/filesearch.pro
+++ b/tests/auto/filesearch/filesearch.pro
@@ -2,7 +2,6 @@ include(../qttest.pri)
 
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
 # Input
 SOURCES += tst_filesearch.cpp
 
diff --git a/tests/auto/filesearch/tst_filesearch.cpp b/tests/auto/filesearch/tst_filesearch.cpp
index dd5f82f78a..0b01a194b0 100644
--- a/tests/auto/filesearch/tst_filesearch.cpp
+++ b/tests/auto/filesearch/tst_filesearch.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <filesearch.h>
+#include <utils/filesearch.h>
 
 #include <QtTest>
 
diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp
index 0a324a9c78..eedb904962 100644
--- a/tests/auto/utils_stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils_stringutils/tst_stringutils.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <stringutils.h>
+#include <utils/stringutils.h>
 
 #include <QtTest>
 
diff --git a/tests/auto/utils_stringutils/utils_stringutils.pro b/tests/auto/utils_stringutils/utils_stringutils.pro
index b1bb63cf3a..b1f68d2a4e 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.pro
+++ b/tests/auto/utils_stringutils/utils_stringutils.pro
@@ -3,7 +3,6 @@ include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
 
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
 SOURCES += tst_stringutils.cpp \
 #    $$UTILS_PATH/stringutils.cpp