--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Tue Aug 11 15:18:59 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Wed Aug 12 08:49:37 2009 -0500
@@ -428,7 +428,6 @@
 	
 	public static void setRomImgTab(ILaunchConfigurationWorkingCopy configuration, IProject project) {
 
-		configuration.setAttribute( PreferenceConstants.J_PN_DebugNonXip, false);
 		configuration.setAttribute( PreferenceConstants.J_PN_DownloadRomImage, false);
 		configuration.setAttribute( PreferenceConstants.J_PN_RomImagePath, ""); //$NON-NLS-1$
 		configuration.setAttribute( PreferenceConstants.J_PN_DownloadAddress, 0);

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Tue Aug 11 15:18:59 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Wed Aug 12 08:49:37 2009 -0500
@@ -412,7 +412,7 @@
 			// ignore 'urel', 'udeb' and 'lib' directories when getting the binaries for the same target
 			// removeLastSegments(2) will strip the filename and 'urel', 'udeb' or 'lib'
 			IPath launchExeTargetPath = new Path(new File(launchExeName).getCanonicalPath()).removeLastSegments(2); 
-			for (Executable executable : ExecutablesManager.getExecutablesManager().getExecutables()) {
+			for (Executable executable : ExecutablesManager.getExecutablesManager().getExecutables(true)) {
 				IPath exePath = executable.getPath();
 				if (launchExeTargetPath.isPrefixOf(exePath))
 						files.add(new ExeFileToDebug(exePath.toOSString(), true));

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomImageTab.java	Tue Aug 11 15:18:59 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomImageTab.java	Wed Aug 12 08:49:37 2009 -0500
@@ -63,8 +63,6 @@
 	private Button epoc32DirBrowse;
 	
 	private Button logUnresolvedModules;
-	//private Button logUnresolvedSym;
-	private Button debugNonXip;
 
 
 	/* (non-Javadoc)
@@ -287,17 +285,6 @@
 			}
 		});			
 		
-		debugNonXip = createCheckButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.15")); //$NON-NLS-1$
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 3;
-		debugNonXip.setLayoutData(data);
-		debugNonXip.setToolTipText(Messages.getString("RomLogFileTab.16")); //$NON-NLS-1$
-		debugNonXip.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});		
-
 	}
 	
 	/* (non-Javadoc)
@@ -316,7 +303,6 @@
 			romLogFilePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_RomLogFilePath , "" )); //$NON-NLS-1$	
 			epoc32DirPath.setText(configuration.getAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir , "" )); //$NON-NLS-1$
 			logUnresolvedModules.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_LogUnresolved , false ));
-			debugNonXip.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_DebugNonXip , false ));
 
 			downloadImgGroup.setSelection(configuration.getAttribute( PreferenceConstants.J_PN_DownloadRomImage , false ));
 			osImagePath.setText(configuration.getAttribute( PreferenceConstants.J_PN_RomImagePath , "" )); //$NON-NLS-1$
@@ -345,7 +331,6 @@
 		}	
 		configuration.setAttribute( PreferenceConstants.J_PN_SymbianKitEpoc32Dir, epoc32Dir);
 		configuration.setAttribute( PreferenceConstants.J_PN_LogUnresolved, logUnresolvedModules.getSelection());		
-		configuration.setAttribute( PreferenceConstants.J_PN_DebugNonXip, debugNonXip.getSelection());
 		
 		configuration.setAttribute( PreferenceConstants.J_PN_DownloadRomImage, downloadImgGroup.getSelection());
 		configuration.setAttribute( PreferenceConstants.J_PN_RomImagePath, osImagePath.getText());

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Tue Aug 11 15:18:59 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Wed Aug 12 08:49:37 2009 -0500
@@ -135,8 +135,6 @@
 RomLogFileTab.12=Epoc32 dir
 RomLogFileTab.13=Log unresolved modules
 RomLogFileTab.14=This check box allows the user to see the list of unresolved modules from the log file
-RomLogFileTab.15=Debug non-XIP executables
-RomLogFileTab.16=This check box enables the debugging of non-XIP modules i.e. modules from ROFS image 
 RomLogFileTab.17=Symbian ROM log file not specified
 RomLogFileTab.18=Specified Symbian ROM log file does not exist
 RomLogFileTab.19=Epoc32 directory not specified