diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 10:43:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 11:34:46 +0200 |
| commit | 5c874322603444ef02bd578ae302c03a9b1cd034 (patch) | |
| tree | 6339db7c3a2683e18208e75895444f2d2d251ebe /src/libs/utils/theme | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
| download | qt-creator-5c874322603444ef02bd578ae302c03a9b1cd034.tar.gz | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/libs/utils/theme')
| -rw-r--r-- | src/libs/utils/theme/theme.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index e9727bb999..e25e2e7db6 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -150,6 +150,21 @@ public: IconsModeAnalyzeActiveColor, IconsModeHelpActiveColor, + /* Code model Icons */ + + IconsCodeModelKeywordColor, + IconsCodeModelClassColor, + IconsCodeModelStructColor, + IconsCodeModelFunctionColor, + IconsCodeModelVariableColor, + IconsCodeModelEnumColor, + IconsCodeModelMacroColor, + IconsCodeModelAttributeColor, + IconsCodeModelUniformColor, + IconsCodeModelVaryingColor, + IconsCodeModelOverlayBackgroundColor, + IconsCodeModelOverlayForegroundColor, + /* Output panes */ OutputPanes_DebugTextColor, |