feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
This commit is contained in:
Oswald Buddenhagen
2016-04-01 17:31:39 +02:00
parent 26e51ff633 ea1f5d2b6c
commit e426d08e54
143 changed files with 6586 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/cplusplustools.qbs
View File

@@ -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",
]