diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
| commit | c7fdb93865c373c2cd75580d57b90d4ec703c42e (patch) | |
| tree | d493895071dd1e99d8d9368bc665ddf1ad4fbb2a /src/plugins/cpptools/cpptools.qbs | |
| parent | 89a6611e9e2470afd8e56271d2953a8466c9e625 (diff) | |
| parent | 6ffe04bc40568fe9f79e366e1773458f081944d3 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
Change-Id: I2445882a270731b866b04f28ff87d161224c539a
Diffstat (limited to 'src/plugins/cpptools/cpptools.qbs')
| -rw-r--r-- | src/plugins/cpptools/cpptools.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 04abfc88c9..72cc6737b2 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -43,6 +43,7 @@ Project { "builtinindexingsupport.h", "builtincursorinfo.cpp", "builtincursorinfo.h", + "clangbasechecks.ui", "clangdiagnosticconfig.cpp", "clangdiagnosticconfig.h", "clangdiagnosticconfigsmodel.cpp", |