From 0b144bc76a368ecc6c5c1121a1b51e888a0621ac Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 9 Dec 2013 10:56:31 -0800 Subject: Add support for using -isystem in qmake This commit will make qmake use -isystem automatically for any compilers that declare support for it for any paths that are listed in QMAKE_DEFAULT_INCDIRS. Change-Id: I36fefc6d5bba61671f65669f0ea42704b3c3cf31 Reviewed-by: Oswald Buddenhagen --- qmake/generators/makefiledeps.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qmake/generators/makefiledeps.h') diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index ba55c36998..516abd4afd 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -78,6 +78,7 @@ private: SourceFiles *files, *includes; bool files_changed; QList depdirs; + QStringList systemIncludes; //sleezy buffer code char *spare_buffer; @@ -98,6 +99,7 @@ protected: virtual QFileInfo findFileInfo(const QMakeLocalFileName &); public: + QMakeSourceFileInfo(const QString &cachefile=""); virtual ~QMakeSourceFileInfo(); @@ -108,11 +110,15 @@ public: inline void setDependencyMode(DependencyMode mode) { dep_mode = mode; } inline DependencyMode dependencyMode() const { return dep_mode; } + void setSystemIncludes(const ProStringList &list) + { systemIncludes = list.toQStringList(); } + enum SourceFileType { TYPE_UNKNOWN, TYPE_C, TYPE_UI, TYPE_QRC }; enum SourceFileSeek { SEEK_DEPS=0x01, SEEK_MOCS=0x02 }; void addSourceFiles(const ProStringList &, uchar seek, SourceFileType type=TYPE_C); void addSourceFile(const QString &, uchar seek, SourceFileType type=TYPE_C); bool containsSourceFile(const QString &, SourceFileType type=TYPE_C); + bool isSystemInclude(const QString &); int included(const QString &file); QStringList dependencies(const QString &file); -- cgit v1.2.3