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

Merge remote-tracking branch 'origin/4.14' into master

Browse Source 
Change-Id: Ic5e99ec54e2cedbabd78eabc2f0350f90daa0cec
This commit is contained in:
Eike Ziller
2020-10-26 12:13:49 +01:00
parent f515672ffd 1f9124c976
commit 96f6bd53b9
47 changed files with 546 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cpptools/cppcodestylesettingspage.cpp
View File

@@ -36,6 +36,7 @@
#include <coreplugin/icore.h>
#include <cppeditor/cppeditorconstants.h>
#include <texteditor/codestyleeditor.h>
#include <texteditor/fontsettings.h>
#include <texteditor/icodestylepreferencesfactory.h>
#include <texteditor/textdocument.h>
#include <texteditor/displaysettings.h>