AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable depend_includepath by default

Browse Source 
DEPENDPATH is hard to get right, and consequently most projects have
broken dependencies.
the easy way out is just adding everying in INCLUDEPATH to DEPENDPATH,
like we do ourselves in qt. if somebody wants to optimize, he can
opt-out.

Change-Id: I7fb56010728fd2b0d2b7d4d26386f366d414ba04
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-09-03 11:31:55 +02:00 committed by Qt by Nokia
parent ce8e6abe7f
commit 1503d99a5e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6091,7 +6091,7 @@ QT_SOURCE_TREE = \$\$quote($relpath)
QT_BUILD_TREE = \$\$quote($outpath)
include(\$\$PWD/mkspecs/qmodule.pri)
CONFIG += dylib depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build
CONFIG += dylib fix_output_dirs no_private_qt_headers_warning QTDIR_build
EOF

2
mkspecs/features/default_pre.prf
View File

@ -1,5 +1,5 @@
load(exclusive_builds)
CONFIG = lex yacc warn_on debug exceptions $$CONFIG
CONFIG = lex yacc warn_on debug exceptions depend_includepath $$CONFIG
!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) {
!exists($$[QT_HOST_DATA]/.qmake.cache) {

2
tools/configure/configureapp.cpp
View File

@ -2632,7 +2632,7 @@ void Configure::generateCachefile()
for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
cacheStream << (*var) << endl;
}
cacheStream << "CONFIG += " << qmakeConfig.join(" ") << "depend_includepath no_private_qt_headers_warning QTDIR_build" << endl;
cacheStream << "CONFIG += " << qmakeConfig.join(" ") << "no_private_qt_headers_warning QTDIR_build" << endl;
cacheStream.flush();
cacheFile.close();