Commit cf5937a8 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

remove redundant INCLUDEPATHs

src/plugins and src/libs are included by qtcreator.pri

Change-Id: I15ec19856366661bfa74d00e6278f4eb3854acb2
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 3893bb13
......@@ -10,8 +10,8 @@ TEMPLATE = app
CONFIG -= app_bundle
CONFIG += debug
TARGET = qtcreator-lldb
DEPENDPATH += . .. ../.. ../../.. ../../../../libs
INCLUDEPATH += . .. ../.. ../../.. ../../../../libs
DEPENDPATH += . .. ../.. ../../..
INCLUDEPATH += . .. ../.. ../../..
DESTDIR = $$IDE_LIBEXEC_PATH
MOC_DIR=.tmp
......
......@@ -5,7 +5,6 @@ TEMPLATE = app
TARGET = cplusplus-update-frontend
DESTDIR = ./
DEFINES += QTCREATOR_UTILS_STATIC_LIB
INCLUDEPATH += . ../../libs
include(../../../qtcreator.pri)
include(../../libs/cplusplus/cplusplus-lib.pri)
......
include(../../qttest.pri)
include(../shared/shared.pri)
SOURCES += tst_codeformatter.cpp
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
include(../../qttest.pri)
include(../shared/shared.pri)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
SOURCES += tst_misc.cpp
include(../qttest.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
UTILSDIR = $$IDE_SOURCE_TREE/src/libs
DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR
INCLUDEPATH += $$DEBUGGERDIR
SOURCES += \
tst_gdb.cpp \
......
......@@ -5,6 +5,3 @@ include($$IDE_SOURCE_TREE/src/plugins/diffeditor/diffeditor.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
SOURCES += tst_differ.cpp
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins $$IDE_SOURCE_TREE/src/libs
......@@ -12,5 +12,3 @@ SOURCES += tst_specificrules.cpp \
$$GENERICHIGHLIGHTERDIR/highlightdefinition.cpp \
$$GENERICHIGHLIGHTERDIR/keywordlist.cpp \
$$GENERICHIGHLIGHTERDIR/itemdata.cpp
INCLUDEPATH += $$PLUGINSDIR
......@@ -10,7 +10,6 @@ include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp
INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs
#DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
......
......@@ -16,5 +16,3 @@ HEADERS += \
$$SRCDIR/plugins/qmljstools/qmljsqtstylecodeformatter.h \
$$SRCDIR/plugins/texteditor/basetextdocumentlayout.h \
$$SRCDIR/plugins/texteditor/itextmark.h
INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs
......@@ -4,7 +4,6 @@ include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
UTILSDIR = $$IDE_SOURCE_TREE/src/libs/
INCLUDEPATH += $$UTILSDIR
DEFINES += QTCREATOR_UTILS_LIB
*-g++ {
CONFIG -= warn_on
......
......@@ -16,4 +16,4 @@ HEADERS += $$FAKEVIMDIR/fakevimhandler.h \
$$UTILSDIR/hostosinfo.h \
$$UTILSDIR/qtcassert.h
INCLUDEPATH += $$FAKEVIMDIR $$UTILSDIR
INCLUDEPATH += $$FAKEVIMDIR
......@@ -4,7 +4,6 @@ include (../../../qtcreator.pri)
include (../../../src/libs/ssh/ssh.pri)
macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
LIBS *= -L$$IDE_LIBRARY_PATH
unix {
QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_LIBRARY_PATH\"
......
......@@ -12,7 +12,6 @@ include(../../../../src/rpath.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
INCLUDEPATH += ../../../../src/libs
UTILSDIR = ../../../../src/libs/utils
DEFINES += QTCREATOR_UTILS_STATIC_LIB
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment