Merge remote-tracking branch 'origin/2.8'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f

src/libs/cplusplus/LookupContext.cpp

@@ -344,7 +344,6 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope,
                             }
                         }
                     }
-
                 }
             }
         }

src/libs/cplusplus/NamePrettyPrinter.cpp

@@ -105,7 +105,9 @@ void NamePrettyPrinter::visit(const DestructorNameId *name)
 
 void NamePrettyPrinter::visit(const OperatorNameId *name)
 {
-    _name += QLatin1String("operator ");
+    _name += QLatin1String("operator");
+    if (_overview->includeWhiteSpaceInOperatorName)
+        _name += QLatin1Char(' ');
     switch (name->kind()) { // ### i should probably do this in OperatorNameId
     case OperatorNameId::InvalidOp:
         _name += QLatin1String("<invalid>");

src/libs/cplusplus/Overview.cpp

@@ -45,6 +45,7 @@ Overview::Overview()
       showFunctionSignatures(true),
       showDefaultArguments(true),
       showTemplateParameters(false),
+      includeWhiteSpaceInOperatorName(true),
       markedArgument(0),
       markedArgumentBegin(0),
       markedArgumentEnd(0)

src/libs/cplusplus/Overview.h

@@ -108,6 +108,7 @@ public:
     bool showFunctionSignatures: 1;
     bool showDefaultArguments: 1;
     bool showTemplateParameters: 1;
+    bool includeWhiteSpaceInOperatorName: 1; /// "operator =()" vs "operator=()"
 
     /*!
         You can get the start and end position of a function argument