diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 11:31:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-08 13:36:05 +0200 |
| commit | 1503d99a5e76856213e9125d63278339ab0c9327 (patch) | |
| tree | 40aa690cc69027576c6e142fe256a45ac196c8e9 | |
| parent | ce8e6abe7fff563b11ab1e83e2bd83cbac5745f9 (diff) | |
enable depend_includepath by default
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index ca63e384e6..6eb3a396e9 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -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) { diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 31c82be145..8396829748 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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(); |