Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

1 files changed, 12 insertions, 6 deletions

diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp
index 9152549650..edec18ce44 100644
--- a/src/plugins/cpptools/cppprojects.cpp
+++ b/src/plugins/cpptools/cppprojects.cpp
@@ -37,6 +37,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
+#include <utils/qtcassert.h>
+
 #include <QSet>
 #include <QTextStream>
 
@@ -448,12 +450,16 @@ void ProjectPartBuilder::createProjectPart(const QStringList &theSources,
     CppTools::ProjectPart::Ptr part(m_templatePart->copy());
     part->displayName = partName;
 
-    Kit *k = part->project->activeTarget()->kit();
-    if (ToolChain *tc = ToolChainKitInformation::toolChain(k))
-        part->evaluateToolchain(tc,
-                                languageVersion >= ProjectPart::CXX98 ? m_cxxFlags
-                                                                      : m_cFlags,
-                                SysRootKitInformation::sysRoot(k));
+    QTC_ASSERT(part->project, return);
+    if (ProjectExplorer::Target *activeTarget = part->project->activeTarget()) {
+        if (Kit *kit = activeTarget->kit()) {
+            if (ToolChain *toolChain = ToolChainKitInformation::toolChain(kit)) {
+                const QStringList flags = languageVersion >= ProjectPart::CXX98 ? m_cxxFlags
+                                                                                : m_cFlags;
+                part->evaluateToolchain(toolChain, flags, SysRootKitInformation::sysRoot(kit));
+            }
+        }
+    }
 
     part->languageExtensions |= languageExtensions;