Make Qt toolchain selection more resilient.

On my Windows box I have lots of GCC toolchains. Make sure it selects
the one from the Qt install. And fix a few NPEs and things around that.

Change-Id: Ifeeca9271b5055ac773b3b77e372a67e07305130

1 files changed, 6 insertions, 4 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
index 0a3ef900b37..ea940bfadf2 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java
@@ -81,14 +81,16 @@ public abstract class CoreBuildLaunchConfigDelegate extends LaunchConfigurationT
 		// Pick the first one that matches
 		Map<String, String> properties = new HashMap<>();
 		properties.putAll(target.getAttributes());
-		Collection<IToolChain> tcs = toolChainManager.getToolChainsMatching(properties);
-		if (!tcs.isEmpty()) {
-			IToolChain toolChain = tcs.iterator().next();
-			return configManager.getBuildConfiguration(project, toolChain, mode, monitor);
+		for (IToolChain toolChain : toolChainManager.getToolChainsMatching(properties)) {
+			ICBuildConfiguration buildConfig = configManager.getBuildConfiguration(project, toolChain, mode, monitor);
+			if (buildConfig != null) {
+				return buildConfig;
+			}
 		}
 
 		return null;
 	}
+
 	protected IBinary getBinary(ICBuildConfiguration buildConfig) throws CoreException {
 		IBinary[] binaries = buildConfig.getBuildOutput();
 		IBinary exeFile = null;