Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

src/plugins/clangcodemodel/clangassistproposalitem.cpp

@@ -219,7 +219,6 @@ QString ClangAssistProposalItem::text() const
 QIcon ClangAssistProposalItem::icon() const
 {
     using CPlusPlus::Icons;
-    static const CPlusPlus::Icons m_icons;
     static const char SNIPPET_ICON_PATH[] = ":/texteditor/images/snippet.png";
     static const QIcon snippetIcon = QIcon(QLatin1String(SNIPPET_ICON_PATH));
 
@@ -227,11 +226,11 @@ QIcon ClangAssistProposalItem::icon() const
         case CodeCompletion::ClassCompletionKind:
         case CodeCompletion::TemplateClassCompletionKind:
         case CodeCompletion::TypeAliasCompletionKind:
-            return m_icons.iconForType(Icons::ClassIconType);
+            return Icons::iconForType(Icons::ClassIconType);
         case CodeCompletion::EnumerationCompletionKind:
-            return m_icons.iconForType(Icons::EnumIconType);
+            return Icons::iconForType(Icons::EnumIconType);
         case CodeCompletion::EnumeratorCompletionKind:
-            return m_icons.iconForType(Icons::EnumeratorIconType);
+            return Icons::iconForType(Icons::EnumeratorIconType);
         case CodeCompletion::ConstructorCompletionKind:
         case CodeCompletion::DestructorCompletionKind:
         case CodeCompletion::FunctionCompletionKind:
@@ -240,39 +239,39 @@ QIcon ClangAssistProposalItem::icon() const
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::FuncPublicIconType);
+                    return Icons::iconForType(Icons::FuncPublicIconType);
                 default:
-                    return m_icons.iconForType(Icons::FuncPrivateIconType);
+                    return Icons::iconForType(Icons::FuncPrivateIconType);
             }
         case CodeCompletion::SignalCompletionKind:
-            return m_icons.iconForType(Icons::SignalIconType);
+            return Icons::iconForType(Icons::SignalIconType);
         case CodeCompletion::SlotCompletionKind:
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::SlotPublicIconType);
+                    return Icons::iconForType(Icons::SlotPublicIconType);
                 case CodeCompletion::NotAccessible:
                 case CodeCompletion::NotAvailable:
-                    return m_icons.iconForType(Icons::SlotPrivateIconType);
+                    return Icons::iconForType(Icons::SlotPrivateIconType);
             }
         case CodeCompletion::NamespaceCompletionKind:
-            return m_icons.iconForType(Icons::NamespaceIconType);
+            return Icons::iconForType(Icons::NamespaceIconType);
         case CodeCompletion::PreProcessorCompletionKind:
-            return m_icons.iconForType(Icons::MacroIconType);
+            return Icons::iconForType(Icons::MacroIconType);
         case CodeCompletion::VariableCompletionKind:
             switch (m_codeCompletion.availability()) {
                 case CodeCompletion::Available:
                 case CodeCompletion::Deprecated:
-                    return m_icons.iconForType(Icons::VarPublicIconType);
+                    return Icons::iconForType(Icons::VarPublicIconType);
                 default:
-                    return m_icons.iconForType(Icons::VarPrivateIconType);
+                    return Icons::iconForType(Icons::VarPrivateIconType);
             }
         case CodeCompletion::KeywordCompletionKind:
-            return m_icons.iconForType(Icons::KeywordIconType);
+            return Icons::iconForType(Icons::KeywordIconType);
         case CodeCompletion::ClangSnippetKind:
             return snippetIcon;
         case CodeCompletion::Other:
-            return m_icons.iconForType(Icons::UnknownIconType);
+            return Icons::iconForType(Icons::UnknownIconType);
     }
 
     return QIcon();

src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp

@@ -46,6 +46,7 @@
 
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/ExpressionUnderCursor.h>
+#include <cplusplus/Icons.h>
 #include <cplusplus/SimpleLexer.h>
 
 #include <clangbackendipc/filecontainer.h>
@@ -454,7 +455,7 @@ void ClangCompletionAssistProcessor::completeIncludePath(const QString &realPath
             auto *item = new ClangPreprocessorAssistProposalItem;
             item->setText(text);
             item->setDetail(hint);
-            item->setIcon(m_icons.keywordIcon());
+            item->setIcon(Icons::keywordIcon());
             item->setCompletionOperator(m_completionOperator);
             m_completions.append(item);
         }
@@ -465,11 +466,11 @@ bool ClangCompletionAssistProcessor::completePreprocessorDirectives()
 {
     foreach (const QString &preprocessorCompletion, m_preprocessorCompletions)
         addCompletionItem(preprocessorCompletion,
-                          m_icons.iconForType(Icons::MacroIconType));
+                          Icons::iconForType(Icons::MacroIconType));
 
     if (m_interface->objcEnabled())
         addCompletionItem(QLatin1String("import"),
-                          m_icons.iconForType(Icons::MacroIconType));
+                          Icons::iconForType(Icons::MacroIconType));
 
     return !m_completions.isEmpty();
 }
@@ -477,7 +478,7 @@ bool ClangCompletionAssistProcessor::completePreprocessorDirectives()
 bool ClangCompletionAssistProcessor::completeDoxygenKeywords()
 {
     for (int i = 1; i < CppTools::T_DOXY_LAST_TAG; ++i)
-        addCompletionItem(QString::fromLatin1(CppTools::doxygenTagSpell(i)), m_icons.keywordIcon());
+        addCompletionItem(QString::fromLatin1(CppTools::doxygenTagSpell(i)), Icons::keywordIcon());
     return !m_completions.isEmpty();
 }
 

src/plugins/clangcodemodel/clangutils.cpp

@@ -88,6 +88,7 @@ public:
 
         LibClangOptionsBuilder optionsBuilder(*projectPart.data());
 
+        optionsBuilder.addTargetTriple();
         optionsBuilder.addLanguageOption(fileKind);
         optionsBuilder.addOptionsForLanguage(/*checkForBorlandExtensions*/ true);