Merge remote-tracking branch 'origin/2.8'

Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
parent 9055eea11f 6c8f87556a
commit c9128b7fdd
71 changed files with 767 additions and 404 deletions
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -344,7 +344,6 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope,
                            }
                        }
                    }
-
                }
            }
        }