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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a
This commit is contained in:
Eike Ziller
2018-02-13 13:37:37 +01:00
parent 89a6611e9e 6ffe04bc40
commit c7fdb93865
65 changed files with 654 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cpptools/cpptools.pro
View File

@@ -191,6 +191,7 @@ FORMS += \
cppcodemodelsettingspage.ui \
cppcodestylesettingspage.ui \
cppfilesettingspage.ui \
clangbasechecks.ui \
clazychecks.ui \
tidychecks.ui