summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-14 19:58:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-16 22:32:09 +0100
commit7322e9c17fe2f7c0efd2a8477ae8fb5f15fccb63 (patch)
treea4a0b6f9b5dfcac0a0c2cbb25be3492768fed0fe
parent1e0e2916047e62a7c7659d00c1282fbb145212cb (diff)
downloadqt3d-refactor.tar.gz
remove obsolete DEPENDPATH assignmentsrefactor
qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I8f7144bbd53741a2e57f2b90a41a13aa16efc53e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--3rdparty/assimp/assimp.pri14
-rw-r--r--examples/qt3d/solarsystem/solarsystem.pro1
2 files changed, 0 insertions, 15 deletions
diff --git a/3rdparty/assimp/assimp.pri b/3rdparty/assimp/assimp.pri
index b1b494a3a..a3810b39a 100644
--- a/3rdparty/assimp/assimp.pri
+++ b/3rdparty/assimp/assimp.pri
@@ -7,20 +7,6 @@ CONFIG += exceptions
win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
-DEPENDPATH += \
- $$PWD \
- $$PWD/code \
- $$PWD/include \
- $$PWD/code/res \
- $$PWD/contrib/ConvertUTF \
- $$PWD/contrib/irrXML \
- $$PWD/contrib/unzip \
- $$PWD/contrib/zlib \
- $$PWD/include/Compiler \
- $$PWD/code/BoostWorkaround/boost \
- $$PWD/code/BoostWorkaround/boost/math \
- $$PWD/code/BoostWorkaround/boost/tuple
-
VPATH += \
$$PWD \
$$PWD/code \
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index b5952e80a..ec311c3c3 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -8,7 +8,6 @@ SOURCES = solarsystem.cpp \
main.cpp
HEADERS = solarsystem.h
RESOURCES += solarsystem.qrc
-DEPENDPATH += resources
OTHER_FILES += \
resources/moon-texture.jpg \