Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6

src/libs/cplusplus/LookupContext.h

@@ -58,7 +58,15 @@ public:
     }
     bool contains(const T *item)
     {
-        return _container.contains(item);
+        if (_container.contains(item))
+            return true;
+
+        foreach (const T *existingItem, _container) {
+            if (existingItem->isEqualTo(item))
+                return true;
+        }
+
+        return false;
     }
 
     void clear(const T *item)