diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-08-30 14:41:54 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-12-19 20:53:25 +0000 |
| commit | 71f67db3653775490642a2568801d4b4d08f7765 (patch) | |
| tree | c4ea7f9218edb6ad2cc207a29634e93d0e74d4bc /src/lib/corelib/buildgraph/depscanner.cpp | |
| parent | 800f4287193aa76e0735051a38cf226244a31e5c (diff) | |
Add distribution-specific properties for include, library, and framework paths
This allows to ensure that custom (user) locations come before
canonical shared locations of a particular distribution like
MacPorts (/opt/local/include) or FreeBSD (/usr/local/include).
Change-Id: Ia37b28408312300a42ccc31c7532ffdaf49c1c51
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/depscanner.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/depscanner.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp index 824c3cf75..c5a94a838 100644 --- a/src/lib/corelib/buildgraph/depscanner.cpp +++ b/src/lib/corelib/buildgraph/depscanner.cpp @@ -68,6 +68,7 @@ static QStringList collectCppIncludePaths(const QVariantMap &modules) result << cpp.value(QLatin1String("includePaths")).toStringList() << cpp.value(QLatin1String("systemIncludePaths")).toStringList() + << cpp.value(QLatin1String("distributionIncludePaths")).toStringList() << cpp.value(QLatin1String("compilerIncludePaths")).toStringList(); result.removeDuplicates(); return result; |