diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-01 11:19:32 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-02 09:40:24 +0000 |
| commit | 46fc33d9147c843d122d8384ab9c1465ef716ee1 (patch) | |
| tree | f38df0070a41eb5d3a670dd3730ff332cdb263cc /src/plugins/qtsupport/qtversionmanager.cpp | |
| parent | 87e01423c90e6ada4b0388f7a7ee3ba83567fd2f (diff) | |
Don't mix iterator and const_iterator
This avoids unnecessary detaches of the Qt container data.
The mismatches where detected by defining QT_STRICT_ITERATORS;
however, this define violates the ODR (causing linker errors),
and therefore is not added permanently.
Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c
GPush-Base: 62b0848b9cf357bcded4184c71d490bae56c773b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport/qtversionmanager.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtversionmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 7513ad40e3f..f4daf2a5e14 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -495,7 +495,7 @@ bool QtVersionManager::isValidId(int id) BaseQtVersion *QtVersionManager::version(int id) { QTC_ASSERT(isLoaded(), return 0); - QMap<int, BaseQtVersion *>::const_iterator it = m_versions.find(id); + QMap<int, BaseQtVersion *>::const_iterator it = m_versions.constFind(id); if (it == m_versions.constEnd()) return 0; return it.value(); |