diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-01 17:31:39 +0200 |
| commit | e426d08e54bd10b7513a3ced9cf9237b75b06b45 (patch) | |
| tree | b4f20c8d93877aa4ef6964ec8c700102def865d0 /src/tools/cplusplustools.qbs | |
| parent | 26e51ff633a8d3b60ec25fe875724cfe5e3f92df (diff) | |
| parent | ea1f5d2b6c896f9dc5791d981ab5a8630f4561f6 (diff) | |
| download | qt-creator-e426d08e54bd10b7513a3ced9cf9237b75b06b45.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/debugger/debuggerruncontrol.cpp
Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
Diffstat (limited to 'src/tools/cplusplustools.qbs')
| -rw-r--r-- | src/tools/cplusplustools.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/cplusplustools.qbs b/src/tools/cplusplustools.qbs index fe2fc5cf16..ee17e6baa6 100644 --- a/src/tools/cplusplustools.qbs +++ b/src/tools/cplusplustools.qbs @@ -7,6 +7,7 @@ Project { references: [ "cplusplus-ast2png/cplusplus-ast2png.qbs", "cplusplus-frontend/cplusplus-frontend.qbs", + "cplusplus-keywordgen/cplusplus-keywordgen.qbs", "cplusplus-mkvisitor/cplusplus-mkvisitor.qbs", "cplusplus-update-frontend/cplusplus-update-frontend.qbs", ] |