diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2020-06-03 13:06:01 +0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-06-06 09:53:59 +0000 |
| commit | f133b226cdf4f2736b412bb642b45d43cb84f51d (patch) | |
| tree | ce947911588c1a4035eceacbc15c566ce0f384b9 /qmake/generators/win32 | |
| parent | ee635571122e1dd9b77276afb0f642e7ac9a015a (diff) | |
qmake: Stop using -isystem flag
This option changes the order of include paths, which can cause problems
of various kinds. See https://bugs.debian.org/958479 for an example.
The benefit of that option is minimal for what it was intended.
Pick-to: 5.15 5.12
Change-Id: I80eeabd09764df290b60bc59aeb2f90d07723608
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 432525ffba..2ffcff9a3c 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -200,17 +200,12 @@ void MingwMakefileGenerator::writeIncPart(QTextStream &t) { t << "INCPATH = "; - QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); const ProStringList &incs = project->values("INCLUDEPATH"); for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) { QString inc = (*incit).toQString(); inc.replace(QRegularExpression("\\\\$"), ""); - if (!isystem.isEmpty() && isSystemInclude(inc)) - t << isystem << ' '; - else - t << "-I"; - t << escapeFilePath(inc) << ' '; + t << "-I" << escapeFilePath(inc) << ' '; } t << Qt::endl; } |