Merge remote-tracking branch 'origin/2.6'

2012-08-23 15:52:15 +02:00
parent 888b7217cb 6a56990302
commit bc67246432
530 changed files with 9207 additions and 33307 deletions
--- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
+++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.cpp
@@ -387,8 +387,7 @@ FullySpecifiedType ApplySubstitution::applySubstitution(int index) const
 } // end of anonymous namespace

 DeprecatedGenTemplateInstance::DeprecatedGenTemplateInstance(QSharedPointer<Control> control, const Substitution &substitution)
-    : _symbol(0),
-      _control(control),
+    : _control(control),
      _substitution(substitution)
 { }