diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-11 18:27:52 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-11 18:27:52 +0200 |
| commit | 9ff8979da32642e60029cb7cf8536eed6442c270 (patch) | |
| tree | 4c1bb2288209c4c9b65408d7ec104747b278cd43 /src/plugins/cpptools/cppchecksymbols.h | |
| parent | e6eb061293a63bf52fb34dc39016d0fa8bbbe12b (diff) | |
| parent | 567098f210a7f73b98f02132a545bd5b5420e5a4 (diff) | |
| download | qt-creator-9ff8979da32642e60029cb7cf8536eed6442c270.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/cpptools/cppchecksymbols.h
src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp
Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
Diffstat (limited to 'src/plugins/cpptools/cppchecksymbols.h')
| -rw-r--r-- | src/plugins/cpptools/cppchecksymbols.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index 69ac7e2530..814516f221 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -166,6 +166,8 @@ protected: void flush(); private: + bool isConstructorDeclaration(CPlusPlus::Symbol *declaration); + CPlusPlus::Document::Ptr _doc; CPlusPlus::LookupContext _context; CPlusPlus::TypeOfExpression typeOfExpression; |