Merge commit 'origin/1.3'

2009-11-09 11:36:19 +01:00
parent 040ab7a93f a253a69980
commit 36d0d8500e
7 changed files with 92 additions and 46 deletions
--- a/src/plugins/cpptools/cppcodecompletion.h
+++ b/src/plugins/cpptools/cppcodecompletion.h
@@ -118,7 +118,7 @@ private:

    bool completeConstructorOrFunction(const QList<CPlusPlus::TypeOfExpression::Result> &,
                                       const CPlusPlus::LookupContext &,
-                                       int endOfExpression);
+                                       int endOfExpression, bool toolTipOnly);

    bool completeMember(const QList<CPlusPlus::TypeOfExpression::Result> &,
                        const CPlusPlus::LookupContext &context);