summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefiledeps.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-12-09 10:56:31 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 02:42:31 +0100
commit0b144bc76a368ecc6c5c1121a1b51e888a0621ac (patch)
tree7e461a57e9170fb39b935923e227abfff3af583a /qmake/generators/makefiledeps.h
parent6f7d370adec3054656f36b0d2a0777a8a1df3602 (diff)
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/makefiledeps.h')
-rw-r--r--qmake/generators/makefiledeps.h6
1 files changed, 6 insertions, 0 deletions
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<QMakeLocalFileName> 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);