Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5

src/plugins/cpptools/compileroptionsbuilder.cpp

@@ -442,6 +442,9 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension
     if (languageExtensions & LanguageExtension::Microsoft)
         opts << QLatin1String("-fms-extensions");
 
+    if (languageExtensions & LanguageExtension::OpenMP)
+        opts << QLatin1String("-fopenmp");
+
     if (checkForBorlandExtensions && (languageExtensions & LanguageExtension::Borland))
         opts << QLatin1String("-fborland-extensions");
 

src/plugins/cpptools/cppcodestylesettings.cpp

@@ -200,22 +200,24 @@ bool CppCodeStyleSettings::equals(const CppCodeStyleSettings &rhs) const
            ;
 }
 
-CppCodeStyleSettings CppCodeStyleSettings::currentProjectCodeStyle()
+Utils::optional<CppCodeStyleSettings> CppCodeStyleSettings::currentProjectCodeStyle()
 {
     ProjectExplorer::Project *project = ProjectExplorer::ProjectTree::currentProject();
+    using OptSettings = Utils::optional<CppCodeStyleSettings>;
     if (!project)
-        return currentGlobalCodeStyle();
+        return OptSettings();
 
     ProjectExplorer::EditorConfiguration *editorConfiguration = project->editorConfiguration();
-    QTC_ASSERT(editorConfiguration, return currentGlobalCodeStyle());
+    QTC_ASSERT(editorConfiguration, return OptSettings());
 
     TextEditor::ICodeStylePreferences *codeStylePreferences
         = editorConfiguration->codeStyle(Constants::CPP_SETTINGS_ID);
-    QTC_ASSERT(codeStylePreferences, return currentGlobalCodeStyle());
+    QTC_ASSERT(codeStylePreferences, return OptSettings());
 
     CppCodeStylePreferences *cppCodeStylePreferences
         = dynamic_cast<CppCodeStylePreferences *>(codeStylePreferences);
-    QTC_ASSERT(cppCodeStylePreferences, return currentGlobalCodeStyle());
+    if (!cppCodeStylePreferences)
+        return OptSettings();
 
     return cppCodeStylePreferences->currentCodeStyleSettings();
 }
@@ -270,7 +272,9 @@ static void configureOverviewWithCodeStyleSettings(CPlusPlus::Overview &overview
 CPlusPlus::Overview CppCodeStyleSettings::currentProjectCodeStyleOverview()
 {
     CPlusPlus::Overview overview;
-    configureOverviewWithCodeStyleSettings(overview, currentProjectCodeStyle());
+    const Utils::optional<CppCodeStyleSettings> codeStyleSettings = currentProjectCodeStyle();
+    configureOverviewWithCodeStyleSettings(overview,
+                                           codeStyleSettings.value_or(currentGlobalCodeStyle()));
     return overview;
 }
 

src/plugins/cpptools/cppcodestylesettings.h

@@ -27,6 +27,8 @@
 
 #include "cpptools_global.h"
 
+#include <utils/optional.h>
+
 #include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
@@ -93,7 +95,7 @@ public:
     bool operator==(const CppCodeStyleSettings &s) const { return equals(s); }
     bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); }
 
-    static CppCodeStyleSettings currentProjectCodeStyle();
+    static Utils::optional<CppCodeStyleSettings> currentProjectCodeStyle();
     static CppCodeStyleSettings currentGlobalCodeStyle();
     static TextEditor::TabSettings currentProjectTabSettings();
     static TextEditor::TabSettings currentGlobalTabSettings();

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -95,14 +95,15 @@ public:
         StringTable::destroy();
         delete m_cppFileSettingsPage;
         delete m_cppCodeModelSettingsPage;
-        delete m_cppCodeStyleSettingsPage;
+        if (m_cppCodeStyleSettingsPage)
+            delete m_cppCodeStyleSettingsPage;
     }
 
     QSharedPointer<CppCodeModelSettings> m_codeModelSettings;
     CppToolsSettings *m_settings = nullptr;
     CppFileSettingsPage *m_cppFileSettingsPage = nullptr;
     CppCodeModelSettingsPage *m_cppCodeModelSettingsPage = nullptr;
-    CppCodeStyleSettingsPage *m_cppCodeStyleSettingsPage = nullptr;
+    QPointer<CppCodeStyleSettingsPage> m_cppCodeStyleSettingsPage = nullptr;
 };
 
 CppToolsPlugin::CppToolsPlugin()

src/plugins/cpptools/cpptoolsreuse.cpp

@@ -258,7 +258,20 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb)
                     "CppIndexer",
                     "C++ Indexer: Skipping file \"%1\" because it is too big.")
                         .arg(absoluteFilePath);
-        Core::MessageManager::write(msg, Core::MessageManager::Silent);
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+        QMetaObject::invokeMethod(Core::MessageManager::instance(), [msg]() {
+            Core::MessageManager::write(msg, Core::MessageManager::Silent);
+        });
+#else
+        QMetaObject::invokeMethod(Core::MessageManager::instance(),
+                                  "write",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(QString, msg),
+                                  Q_ARG(Core::MessageManager::PrintToOutputPaneFlags,
+                                        Core::MessageManager::Silent));
+#endif
+
         qWarning().noquote() << msg;
         return true;
     }