forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -29,7 +29,8 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "cplusplus-tools-utils.h"
|
#include "cplusplus-tools-utils.h"
|
||||||
#include "environment.h"
|
|
||||||
|
#include <utils/environment.h>
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
DEPENDPATH += $$PWD
|
DEPENDPATH += $$PWD
|
||||||
INCLUDEPATH += $$PWD $$PWD/../../libs/utils
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
DEFINES *= QT_NO_CAST_FROM_ASCII
|
DEFINES *= QT_NO_CAST_FROM_ASCII
|
||||||
DEFINES += PATH_PREPROCESSOR_CONFIG=\\\"$$PWD/pp-configuration.inc\\\"
|
DEFINES += PATH_PREPROCESSOR_CONFIG=\\\"$$PWD/pp-configuration.inc\\\"
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
QT -= gui
|
QT -= gui
|
||||||
include(../qttest.pri)
|
include(../qttest.pri)
|
||||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/aggregation
|
|
||||||
include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri)
|
include($$IDE_SOURCE_TREE/src/libs/aggregation/aggregation.pri)
|
||||||
SOURCES += tst_aggregate.cpp
|
SOURCES += tst_aggregate.cpp
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <aggregate.h>
|
#include <aggregation/aggregate.h>
|
||||||
|
|
||||||
#include <QtTest>
|
#include <QtTest>
|
||||||
|
|
||||||
|
@@ -2,7 +2,6 @@ include(../qttest.pri)
|
|||||||
|
|
||||||
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
|
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
|
||||||
|
|
||||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
|
|
||||||
# Input
|
# Input
|
||||||
SOURCES += tst_filesearch.cpp
|
SOURCES += tst_filesearch.cpp
|
||||||
|
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <filesearch.h>
|
#include <utils/filesearch.h>
|
||||||
|
|
||||||
#include <QtTest>
|
#include <QtTest>
|
||||||
|
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <stringutils.h>
|
#include <utils/stringutils.h>
|
||||||
|
|
||||||
#include <QtTest>
|
#include <QtTest>
|
||||||
|
|
||||||
|
@@ -3,7 +3,6 @@ include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
|
|||||||
|
|
||||||
DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
|
DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
|
||||||
|
|
||||||
INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/utils
|
|
||||||
SOURCES += tst_stringutils.cpp \
|
SOURCES += tst_stringutils.cpp \
|
||||||
# $$UTILS_PATH/stringutils.cpp
|
# $$UTILS_PATH/stringutils.cpp
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user