diff options
| author | Oswald Buddenhagen <[email protected]> | 2012-04-19 16:13:09 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2012-04-19 16:13:09 +0200 |
| commit | 822233629d71375008b633b8678f9e31c9ee7dc0 (patch) | |
| tree | 0c59ba19deb261e7421f6bd797761d02a5bca237 /src/libs/cplusplus/cplusplus.qbs | |
| parent | c863662bb276e1649f01f77559b3f9ca10cf60b7 (diff) | |
| parent | ca516cf31d1a1d3b2d921c5e4ceed7c70a260f24 (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
qtcreator.pri
src/libs/utils/utils.qbs
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmljseditor/qmljseditor.qbs
src/plugins/qmljsinspector/qmljsinspector.qbs
Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
Diffstat (limited to 'src/libs/cplusplus/cplusplus.qbs')
| -rw-r--r-- | src/libs/cplusplus/cplusplus.qbs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index 828c41f52f0..31b17d3d64f 100644 --- a/src/libs/cplusplus/cplusplus.qbs +++ b/src/libs/cplusplus/cplusplus.qbs @@ -173,6 +173,7 @@ QtcLibrary { ] ProductModule { + Depends { name: "cpp" } cpp.includePaths: [ ".", "../3rdparty", |