Merge remote-tracking branch 'origin/4.14'

Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771

src/libs/3rdparty/cplusplus/Bind.cpp

@@ -135,6 +135,8 @@ void Bind::setDeclSpecifiers(Symbol *symbol, const FullySpecifiedType &declSpeci
     if (Function *funTy = symbol->asFunction()) {
         if (declSpecifiers.isVirtual())
             funTy->setVirtual(true);
+        if (declSpecifiers.isStatic())
+            funTy->setStatic(true);
     }
 
     if (declSpecifiers.isDeprecated())

src/libs/3rdparty/cplusplus/Symbols.cpp

@@ -405,6 +405,7 @@ FullySpecifiedType Function::type() const
     FullySpecifiedType ty(const_cast<Function *>(this));
     ty.setConst(isConst());
     ty.setVolatile(isVolatile());
+    ty.setStatic(isStatic());
     return ty;
 }
 

src/libs/3rdparty/cplusplus/Symbols.h

@@ -352,6 +352,9 @@ public:
     bool isConst() const;
     void setConst(bool isConst);
 
+    bool isStatic() const { return f._isStatic; }
+    void setStatic(bool isStatic) { f._isStatic = isStatic; }
+
     bool isVolatile() const;
     void setVolatile(bool isVolatile);
 
@@ -399,6 +402,7 @@ private:
         unsigned _isVirtual: 1;
         unsigned _isOverride: 1;
         unsigned _isFinal: 1;
+        unsigned _isStatic: 1;
         unsigned _isVariadic: 1;
         unsigned _isVariadicTemplate: 1;
         unsigned _isPureVirtual: 1;