--- a/mkspecs/common/clang.conf +++ a/mkspecs/common/clang.conf @@ -16,7 +16,6 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX CONFIG += clang_pch_style QMAKE_PCH_OUTPUT_EXT = .pch -QMAKE_CFLAGS_ISYSTEM = -isystem QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_LTCG = -flto --- a/mkspecs/common/gcc-base.conf +++ a/mkspecs/common/gcc-base.conf @@ -44,7 +44,6 @@ QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC QMAKE_CFLAGS_APP += -fPIC -QMAKE_CFLAGS_ISYSTEM = -isystem QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions --- a/mkspecs/linux-icc/qmake.conf +++ a/mkspecs/linux-icc/qmake.conf @@ -21,7 +21,6 @@ QMAKE_CFLAGS_DEBUG = -O0 -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_ISYSTEM = -isystem QMAKE_CFLAGS_THREAD = -D_REENTRANT QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections QMAKE_CFLAGS_LTCG = -ipo -fno-fat-lto-objects --- a/qmake/generators/unix/unixmake2.cpp +++ a/qmake/generators/unix/unixmake2.cpp @@ -180,16 +180,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n"; t << "INCPATH ="; { - QString isystem = var("QMAKE_CFLAGS_ISYSTEM"); const ProStringList &incs = project->values("INCLUDEPATH"); for(int i = 0; i < incs.size(); ++i) { const ProString &inc = incs.at(i); - if (inc.isEmpty()) - continue; - - if (!isystem.isEmpty() && isSystemInclude(inc.toQString())) - t << ' ' << isystem << ' '; - else + if (!inc.isEmpty()) t << " -I"; t << escapeFilePath(inc); } @@ -1332,10 +1326,8 @@ void UnixMakefileGenerator::init2() } if (include_deps && project->isActiveConfig("gcc_MD_depends")) { - // use -MMD if we know about -isystem too - ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD"); - project->values("QMAKE_CFLAGS") += MD_flag; - project->values("QMAKE_CXXFLAGS") += MD_flag; + project->values("QMAKE_CFLAGS") += "-MD"; + project->values("QMAKE_CXXFLAGS") += "-MD"; } } --- a/qmake/generators/win32/mingw_make.cpp +++ a/qmake/generators/win32/mingw_make.cpp @@ -254,17 +254,11 @@ 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(QRegExp("\\\\$"), ""); - - if (!isystem.isEmpty() && isSystemInclude(inc)) - t << isystem << ' '; - else - t << "-I"; - t << escapeFilePath(inc) << ' '; + t << "-I" << escapeFilePath(inc) << ' '; } t << endl; }