diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-02 16:24:13 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-06 16:35:58 +0000 |
| commit | 81e2141158af5ad4f457a2671dd2717d8302e90e (patch) | |
| tree | 9abe27104e0eb25304143ffa4f55622541696812 /src/lib/qtprofilesetup/templates | |
| parent | f8db4c3b0c8f286f8ef0831d6c386b94a6248d3e (diff) | |
Determine the compiler's default include and lib directories.
This fixes an issue where moc may fail to find some headers when
building Qt or projects that use Qt.
Change-Id: I52981139a3127539a4d5d9ba6e8d61575f7a0082
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/qtprofilesetup/templates')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/moc.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js index 4fb33fe4e..5459cf536 100644 --- a/src/lib/qtprofilesetup/templates/moc.js +++ b/src/lib/qtprofilesetup/templates/moc.js @@ -39,9 +39,13 @@ function args(product, input, outputFileName) var includePaths = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'includePaths'); includePaths = includePaths.uniqueConcat(ModUtils.modulePropertiesFromArtifacts( product, [input], 'cpp', 'systemIncludePaths')); + includePaths = includePaths.uniqueConcat(ModUtils.modulePropertiesFromArtifacts( + product, [input], 'cpp', 'compilerIncludePaths')); var frameworkPaths = product.moduleProperties("cpp", "frameworkPaths"); frameworkPaths = frameworkPaths.uniqueConcat( product.moduleProperties("cpp", "systemFrameworkPaths")); + frameworkPaths = frameworkPaths.uniqueConcat( + product.moduleProperties("cpp", "compilerFrameworkPaths")); var args = []; args = args.concat( defines.map(function(item) { return '-D' + item; }), |