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/cplusplus/OverviewModel.cpp | |
| 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/cplusplus/OverviewModel.cpp')
| -rw-r--r-- | src/libs/cplusplus/OverviewModel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index be389ab5fb..f37d5456ef 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -27,6 +27,7 @@ #include "Overview.h" +#include <cplusplus/Icons.h> #include <cplusplus/Scope.h> #include <cplusplus/Literals.h> #include <cplusplus/Symbols.h> @@ -210,7 +211,7 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const case Qt::DecorationRole: { Symbol *symbol = static_cast<Symbol *>(index.internalPointer()); - return _icons.iconForSymbol(symbol); + return Icons::iconForSymbol(symbol); } break; case FileNameRole: { |