diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index 605100e06c8..718b52308c3 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -67,112 +67,119 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
         data.insert(QLatin1String(QBS_SYSROOT), sysroot);
 
     ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
-    if (tc) {
-        // FIXME/CLARIFY: How to pass the sysroot?
-        ProjectExplorer::Abi targetAbi = tc->targetAbi();
-        if (targetAbi.architecture() != ProjectExplorer::Abi::UnknownArchitecture) {
-            QString architecture = ProjectExplorer::Abi::toString(targetAbi.architecture());
+    if (!tc)
+        return data;
 
-            // We have to be conservative tacking on suffixes to arch names because an arch that is
-            // already 64-bit may get an incorrect name as a result (i.e. Itanium)
-            if (targetAbi.wordWidth() == 64) {
-                switch (targetAbi.architecture()) {
-                case ProjectExplorer::Abi::X86Architecture:
-                    architecture.append(QLatin1String("_"));
-                    // fall through
-                case ProjectExplorer::Abi::ArmArchitecture:
-                case ProjectExplorer::Abi::MipsArchitecture:
-                case ProjectExplorer::Abi::PowerPCArchitecture:
-                    architecture.append(QString::number(targetAbi.wordWidth()));
-                    break;
-                default:
-                    break;
-                }
+    // FIXME/CLARIFY: How to pass the sysroot?
+    ProjectExplorer::Abi targetAbi = tc->targetAbi();
+    if (targetAbi.architecture() != ProjectExplorer::Abi::UnknownArchitecture) {
+        QString architecture = ProjectExplorer::Abi::toString(targetAbi.architecture());
+
+        // We have to be conservative tacking on suffixes to arch names because an arch that is
+        // already 64-bit may get an incorrect name as a result (i.e. Itanium)
+        if (targetAbi.wordWidth() == 64) {
+            switch (targetAbi.architecture()) {
+            case ProjectExplorer::Abi::X86Architecture:
+                architecture.append(QLatin1String("_"));
+                // fall through
+            case ProjectExplorer::Abi::ArmArchitecture:
+            case ProjectExplorer::Abi::MipsArchitecture:
+            case ProjectExplorer::Abi::PowerPCArchitecture:
+                architecture.append(QString::number(targetAbi.wordWidth()));
+                break;
+            default:
+                break;
             }
-
-            data.insert(QLatin1String(QBS_ARCHITECTURE),
-                        qbs::Internal::HostOsInfo::canonicalArchitecture(architecture));
         }
 
-        if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
-            data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("windows"));
-            data.insert(QLatin1String(QBS_TOOLCHAIN),
-                               targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor
-                                   ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
-                                   : QStringList() << QLatin1String("msvc"));
-        } else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) {
-            const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
-            const char IOS_SIMULATOR_TYPE[] = "Ios.Simulator.Type";
+        data.insert(QLatin1String(QBS_ARCHITECTURE),
+                    qbs::Internal::HostOsInfo::canonicalArchitecture(architecture));
+    }
 
-            const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k);
-            QStringList targetOS;
-            targetOS << QLatin1String("darwin") << QLatin1String("bsd4")
-                     << QLatin1String("bsd") << QLatin1String("unix");
-            if (qt && qt->type() == QLatin1String(IOSQT)) {
-                targetOS.insert(0, QLatin1String("ios"));
-                if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k) == IOS_SIMULATOR_TYPE)
-                    targetOS.insert(0, QLatin1String("ios-simulator"));
-            } else {
-                targetOS.insert(0, QLatin1String("osx"));
-            }
-            data.insert(QLatin1String(QBS_TARGETOS), targetOS);
+    switch (targetAbi.os()) {
+    case ProjectExplorer::Abi::WindowsOS:
+        data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("windows"));
+        data.insert(QLatin1String(QBS_TOOLCHAIN),
+                    targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor
+                    ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
+                    : QStringList() << QLatin1String("msvc"));
+        break;
+    case ProjectExplorer::Abi::MacOS: {
+        const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
+        const char IOS_SIMULATOR_TYPE[] = "Ios.Simulator.Type";
 
-            if (tc->type() != QLatin1String("clang")) {
-                data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
-            } else {
-                data.insert(QLatin1String(QBS_TOOLCHAIN),
-                            QStringList() << QLatin1String("clang")
-                            << QLatin1String("llvm")
-                            << QLatin1String("gcc"));
-            }
-
-            // Set Xcode SDK name and version - required by Qbs if a sysroot is present
-            // Ideally this would be done in a better way...
-            QRegExp re(QLatin1String("(MacOSX|iPhoneOS|iPhoneSimulator)([0-9]+\\.[0-9]+)\\.sdk"));
-            if (re.exactMatch(QDir(sysroot).dirName())) {
-                data.insert(QLatin1String(CPP_XCODESDKNAME), QString(re.cap(1).toLower() + re.cap(2)));
-                data.insert(QLatin1String(CPP_XCODESDKVERSION), re.cap(2));
-            }
-        } else if (targetAbi.os() == ProjectExplorer::Abi::LinuxOS) {
-            data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("linux")
-                        << QLatin1String("unix"));
-            if (tc->type() != QLatin1String("clang")) {
-                data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
-            } else {
-                data.insert(QLatin1String(QBS_TOOLCHAIN),
-                            QStringList() << QLatin1String("clang")
-                            << QLatin1String("llvm")
-                            << QLatin1String("gcc"));
-            }
+        const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k);
+        QStringList targetOS;
+        targetOS << QLatin1String("darwin") << QLatin1String("bsd4")
+                 << QLatin1String("bsd") << QLatin1String("unix");
+        if (qt && qt->type() == QLatin1String(IOSQT)) {
+            targetOS.insert(0, QLatin1String("ios"));
+            if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k) == IOS_SIMULATOR_TYPE)
+                targetOS.insert(0, QLatin1String("ios-simulator"));
         } else {
-            // TODO: Factor out toolchain type setting.
-            data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("unix"));
-            if (tc->type() != QLatin1String("clang")) {
-                data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
-            } else {
-                data.insert(QLatin1String(QBS_TOOLCHAIN),
-                            QStringList() << QLatin1String("clang")
-                            << QLatin1String("llvm")
-                            << QLatin1String("gcc"));
-            }
+            targetOS.insert(0, QLatin1String("osx"));
         }
-        Utils::FileName cxx = tc->compilerCommand();
-        const QFileInfo cxxFileInfo = cxx.toFileInfo();
-        QString compilerName = cxxFileInfo.fileName();
-        const QString toolchainPrefix = extractToolchainPrefix(&compilerName);
-        if (!toolchainPrefix.isEmpty())
-            data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
-        data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
-        if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS
-                || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
-            data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
+        data.insert(QLatin1String(QBS_TARGETOS), targetOS);
+
+        if (tc->type() != QLatin1String("clang")) {
+            data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
+        } else {
+            data.insert(QLatin1String(QBS_TOOLCHAIN),
+                        QStringList() << QLatin1String("clang")
+                        << QLatin1String("llvm")
+                        << QLatin1String("gcc"));
         }
-        data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
-        if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
-            const QLatin1String flags("/FS");
-            data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags);
-            data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags);
+
+        // Set Xcode SDK name and version - required by Qbs if a sysroot is present
+        // Ideally this would be done in a better way...
+        QRegExp re(QLatin1String("(MacOSX|iPhoneOS|iPhoneSimulator)([0-9]+\\.[0-9]+)\\.sdk"));
+        if (re.exactMatch(QDir(sysroot).dirName())) {
+            data.insert(QLatin1String(CPP_XCODESDKNAME), QString(re.cap(1).toLower() + re.cap(2)));
+            data.insert(QLatin1String(CPP_XCODESDKVERSION), re.cap(2));
         }
+        break;
+    }
+    case ProjectExplorer::Abi::LinuxOS:
+        data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("linux")
+                    << QLatin1String("unix"));
+        if (tc->type() != QLatin1String("clang")) {
+            data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
+        } else {
+            data.insert(QLatin1String(QBS_TOOLCHAIN),
+                        QStringList() << QLatin1String("clang")
+                        << QLatin1String("llvm")
+                        << QLatin1String("gcc"));
+        }
+        break;
+    default:
+        // TODO: Factor out toolchain type setting.
+        data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("unix"));
+        if (tc->type() != QLatin1String("clang")) {
+            data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
+        } else {
+            data.insert(QLatin1String(QBS_TOOLCHAIN),
+                        QStringList() << QLatin1String("clang")
+                        << QLatin1String("llvm")
+                        << QLatin1String("gcc"));
+        }
+    }
+
+    Utils::FileName cxx = tc->compilerCommand();
+    const QFileInfo cxxFileInfo = cxx.toFileInfo();
+    QString compilerName = cxxFileInfo.fileName();
+    const QString toolchainPrefix = extractToolchainPrefix(&compilerName);
+    if (!toolchainPrefix.isEmpty())
+        data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
+    data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
+    if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS
+            || targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
+        data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
+    }
+    data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
+    if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
+        const QLatin1String flags("/FS");
+        data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags);
+        data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags);
     }
     return data;
 }