Merge remote-tracking branch 'origin/3.2'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c

src/libs/cplusplus/FastPreprocessor.cpp

@@ -66,9 +66,10 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
     return preprocessed;
 }
 
-void FastPreprocessor::sourceNeeded(unsigned line, const QString &fileName,
-                                    IncludeType mode)
+void FastPreprocessor::sourceNeeded(unsigned line, const QString &fileName, IncludeType mode,
+                                    const QStringList &initialIncludes)
 {
+    Q_UNUSED(initialIncludes)
     Q_ASSERT(_currentDoc);
     // CHECKME: Is that cleanName needed?
     QString cleanName = QDir::cleanPath(fileName);

src/libs/cplusplus/FastPreprocessor.h

@@ -57,7 +57,8 @@ public:
     QByteArray run(Document::Ptr newDoc, const QByteArray &source);
 
     // CPlusPlus::Client
-    virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode);
+    virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode,
+                              const QStringList &initialIncludes = QStringList());
 
     virtual void macroAdded(const Macro &);
 

src/libs/cplusplus/FindUsages.cpp

@@ -348,14 +348,14 @@ void FindUsages::objCSelectorArgument(ObjCSelectorArgumentAST *ast)
     // unsigned colon_token = ast->colon_token;
 }
 
-bool FindUsages::visit(AttributeAST *ast)
+bool FindUsages::visit(GnuAttributeAST *ast)
 {
     (void) ast;
     Q_ASSERT(!"unreachable");
     return false;
 }
 
-void FindUsages::attribute(AttributeAST *ast)
+void FindUsages::attribute(GnuAttributeAST *ast)
 {
     if (! ast)
         return;
@@ -1971,12 +1971,12 @@ bool FindUsages::visit(SimpleSpecifierAST *ast)
     return false;
 }
 
-bool FindUsages::visit(AttributeSpecifierAST *ast)
+bool FindUsages::visit(GnuAttributeSpecifierAST *ast)
 {
     // unsigned attribute_token = ast->attribute_token;
     // unsigned first_lparen_token = ast->first_lparen_token;
     // unsigned second_lparen_token = ast->second_lparen_token;
-    for (AttributeListAST *it = ast->attribute_list; it; it = it->next) {
+    for (GnuAttributeListAST *it = ast->attribute_list; it; it = it->next) {
         this->attribute(it->value);
     }
     // unsigned first_rparen_token = ast->first_rparen_token;

src/libs/cplusplus/FindUsages.h

@@ -95,7 +95,7 @@ protected:
     void postfixDeclarator(PostfixDeclaratorAST *ast);
 
     void objCSelectorArgument(ObjCSelectorArgumentAST *ast);
-    void attribute(AttributeAST *ast);
+    void attribute(GnuAttributeAST *ast);
     void declarator(DeclaratorAST *ast, Scope *symbol = 0);
     void qtPropertyDeclarationItem(QtPropertyDeclarationItemAST *ast);
     void qtInterfaceName(QtInterfaceNameAST *ast);
@@ -127,7 +127,7 @@ protected:
 
     // AST
     virtual bool visit(ObjCSelectorArgumentAST *ast);
-    virtual bool visit(AttributeAST *ast);
+    virtual bool visit(GnuAttributeAST *ast);
     virtual bool visit(DeclaratorAST *ast);
     virtual bool visit(QtPropertyDeclarationItemAST *ast);
     virtual bool visit(QtInterfaceNameAST *ast);
@@ -258,7 +258,7 @@ protected:
 
     // SpecifierAST
     virtual bool visit(SimpleSpecifierAST *ast);
-    virtual bool visit(AttributeSpecifierAST *ast);
+    virtual bool visit(GnuAttributeSpecifierAST *ast);
     virtual bool visit(TypeofSpecifierAST *ast);
     virtual bool visit(DecltypeSpecifierAST *ast);
     virtual bool visit(ClassSpecifierAST *ast);

src/libs/cplusplus/PreprocessorClient.h

@@ -32,7 +32,7 @@
 
 #include <cplusplus/CPlusPlusForwardDeclarations.h>
 
-#include <QString>
+#include <QStringList>
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
@@ -100,7 +100,8 @@ public:
   virtual void startSkippingBlocks(unsigned utf16charsOffset) = 0;
   virtual void stopSkippingBlocks(unsigned utf16charsOffset) = 0;
 
-  virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode) = 0;
+  virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode,
+                            const QStringList &initialIncludes = QStringList()) = 0;
 
   static inline bool isInjectedFile(const QString &fileName)
   {