diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-07-26 10:21:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-07-27 08:54:39 +0000 |
| commit | 3918ce36015971c1bdf3248e822d743d852ffd16 (patch) | |
| tree | 34e106a7ef429c3bb7a2fc2c85b3cee8624fe287 /src/lib/qtprofilesetup/templates | |
| parent | f09f441c4165669d5b3760c0e9b0c30864e0ff6f (diff) | |
Qt.core module: Add property for passing extra options to moc
This is needed sometimes.
Task-number: QBS-998
Change-Id: Idd15f79ec8996b4df5311425727e38ea8d6eebae
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/lib/qtprofilesetup/templates')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 1 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/templates/moc.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index bdde3c77e..e3352491c 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -18,6 +18,7 @@ Module { property path pluginPath property path mkspecPath property string mocName: "moc" + property stringList mocFlags: [] property string lreleaseName: "lrelease" property string qdocName: versionMajor >= 5 ? "qdoc" : "qdoc3" property stringList qdocEnvironment diff --git a/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js index 6c4d74f27..21844f054 100644 --- a/src/lib/qtprofilesetup/templates/moc.js +++ b/src/lib/qtprofilesetup/templates/moc.js @@ -51,6 +51,7 @@ function args(product, input, outputFileName) defines.map(function(item) { return '-D' + item; }), includePaths.map(function(item) { return '-I' + item; }), frameworkPaths.map(function(item) { return '-F' + item; }), + ModUtils.moduleProperties(product, "mocFlags"), '-o', outputFileName, input.filePath); return args; |