diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-09 11:20:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-09 11:20:10 +0100 |
| commit | fe74a9a722e50b16b7f3f73ae96fb891f8613c3c (patch) | |
| tree | 218f6f25240499ee2f7138332c7b73d76df6c2dd /src/libs/cplusplus/LookupContext.h | |
| parent | b03ba2bdb1ca4e96fa8be5da5c53fe48d8393c6f (diff) | |
| parent | 28bcc5634c2521d514fdae7dc05585dc20c1bde6 (diff) | |
| download | qt-creator-fe74a9a722e50b16b7f3f73ae96fb891f8613c3c.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/fakevim/fakevimhandler.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/cxx11/cxx11.pro
tests/auto/cplusplus/cxx11/tst_cxx11.cpp
tests/auto/icheckbuild/icheckbuild.pro
Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
Diffstat (limited to 'src/libs/cplusplus/LookupContext.h')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index ef591a3793..d14bd33403 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -71,7 +71,7 @@ public: void clear(const T *item) { - if (_class != item) + if (_class != item || _container.size() == 1) _container.clear(); } |