# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1266850610 21600
# Node ID ccd4bc5cc0787d4f3fe8a6864a74abbe4fdb711c
# Parent  3360f7e9df9feb13acff8e33baf49c931628abba# Parent  df5d2c2b63ab9706ba3493cda07c45dd97a47ec5
Merge commit

diff -r 3360f7e9df9f -r ccd4bc5cc078 builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Mon Feb 22 08:56:37 2010 -0600
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java	Mon Feb 22 08:56:50 2010 -0600
@@ -25,8 +25,6 @@
 import org.osgi.framework.Version;
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
-import com.nokia.carbide.cpp.sdk.core.ISDKManager;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 
 public class BuilderUtilsPropertyTester extends PropertyTester {
diff -r 3360f7e9df9f -r ccd4bc5cc078 builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Mon Feb 22 08:56:37 2010 -0600
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Mon Feb 22 08:56:50 2010 -0600
@@ -27,7 +27,6 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -46,6 +45,7 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.handlers.HandlerUtil;
 
@@ -133,15 +133,19 @@
 			IWorkbenchWindow window = Activator.getActiveWorkbenchWindow();
 			IWorkbenchPage wpage = window.getActivePage();
 			if (wpage != null) {
-				IEditorPart ep = wpage.getActiveEditor();
-				if (ep != null) {
-					IEditorInput editorInput = ep.getEditorInput();
-					if (editorInput instanceof IFileEditorInput) {
-						IFile file = ((IFileEditorInput)editorInput).getFile();
-						if (file != null) {
-							IProject project = file.getProject();
-							if (CarbideBuilderPlugin.getBuildManager().isCarbideProject(project)) {
-								selectedProjects.add(project);
+				// make sure it's not the disassembly (or DSF disassembly) view
+				IWorkbenchPart part = wpage.getActivePart();
+				if (part == null || !part.getTitle().toLowerCase().endsWith("disassembly")) { //$NON-NLS-1$
+					IEditorPart ep = wpage.getActiveEditor();
+					if (ep != null) {
+						IEditorInput editorInput = ep.getEditorInput();
+						if (editorInput instanceof IFileEditorInput) {
+							IFile file = ((IFileEditorInput)editorInput).getFile();
+							if (file != null) {
+								IProject project = file.getProject();
+								if (CarbideBuilderPlugin.getBuildManager().isCarbideProject(project)) {
+									selectedProjects.add(project);
+								}
 							}
 						}
 					}
diff -r 3360f7e9df9f -r ccd4bc5cc078 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/processes/ProjectCreatedTasksQt.java
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/processes/ProjectCreatedTasksQt.java	Mon Feb 22 08:56:37 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/processes/ProjectCreatedTasksQt.java	Mon Feb 22 08:56:50 2010 -0600
@@ -67,6 +67,18 @@
 			// set EPOCROOT to the default build config's SDK before calling qmake
 			List listOfBuildConfigs = (List) template.getTemplateValues().get(SELECTED_BUILD_CONFIGS_VALUE_KEY);
 
+			// set the default Qt SDK
+			ISymbianSDK sdk = ((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK();
+			String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+			if (qtSDKName == null){
+				QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
+				qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+			}
+			
+			if (qtSDKName != null){
+				QtSDKUtils.setDefaultQtSDKForProject(project, qtSDKName);
+			}
+			
 			IPath epocroot = new Path(((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK().getEPOCROOT());
 			Map<String, String> envMods = new HashMap<String, String>();
 			envMods.put("EPOCROOT", epocroot.setDevice(null).toOSString());
@@ -85,18 +97,6 @@
 			// set the qmake generated pkg files to be built
 			QtUIPlugin.setupSISBuilderSettings(project);
 			
-			// set the default Qt SDK
-			ISymbianSDK sdk = ((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK();
-			String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
-			if (qtSDKName == null){
-				QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
-				qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
-			}
-			
-			if (qtSDKName != null){
-				QtSDKUtils.setDefaultQtSDKForProject(project, qtSDKName);
-			}
-			
 		}
 	}
 }
diff -r 3360f7e9df9f -r ccd4bc5cc078 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java	Mon Feb 22 08:56:37 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java	Mon Feb 22 08:56:50 2010 -0600
@@ -99,6 +99,18 @@
     			// enable the pro file listener by default
     			new QtProject(newProject).setRunQMakeWhenProFileChanges(true);
 
+    			// Set the default Qt SDK, if any
+    			ISymbianSDK sdk = selectedConfigs.get(0).getSDK();
+    			String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+    			if (qtSDKName == null){
+    				QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
+    				qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+    			}
+    			
+    			if (qtSDKName != null){
+    				QtSDKUtils.setDefaultQtSDKForProject(newProject, qtSDKName);
+    			}
+    			
     			// set EPOCROOT to the default build config's SDK before calling qmake
     			IPath epocroot = new Path(selectedConfigs.get(0).getSDK().getEPOCROOT());
     			Map<String, String> envMods = new HashMap<String, String>();
@@ -122,18 +134,6 @@
     			// set the qmake generated pkg files to be built
     			QtUIPlugin.setupSISBuilderSettings(newProject);
     			
-    			// Set the default Qt SDK, if any
-    			ISymbianSDK sdk = selectedConfigs.get(0).getSDK();
-    			String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
-    			if (qtSDKName == null){
-    				QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
-    				qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
-    			}
-    			
-    			if (qtSDKName != null){
-    				QtSDKUtils.setDefaultQtSDKForProject(newProject, qtSDKName);
-    			}
-    			
     			if (monitor.isCanceled()) {
 	    			// the user canceled the import so delete the project
 	    			newProject.delete(false, true, null);