# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1264435782 21600
# Node ID cc0961d7c88d2430411db0aef448ef40c3595225
# Parent  125f1619c573e98bf47150b6d417b33b5bb8e083# Parent  3a264b9d91efd1d1ded5991dc5faff944eea0f2e
daily merge

diff -r 125f1619c573 -r cc0961d7c88d debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Mon Jan 25 10:09:23 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Mon Jan 25 10:09:42 2010 -0600
@@ -281,7 +281,7 @@
 
 					if (isEmulatorRequired(buildConfig, mainExeHostPath, mainExeWorkspaceRelativeMMPPath)) {
 						IPath releaseRoot = buildConfig.getSDK().getReleaseRoot();
-						String winscwudeb = releaseRoot.toOSString() + File.separator + "WINSCW" + File.separator + "UDEB"; //$NON-NLS-1$ //$NON-NLS-2$
+						String winscwudeb = releaseRoot.toOSString() + File.separator + "WINSCW" + File.separator + buildConfig.getTargetString(); //$NON-NLS-1$ //$NON-NLS-2$
 
 						String emulatorPath = winscwudeb + File.separator + "epoc.exe"; //$NON-NLS-1$
 						configuration.setAttribute(DebuggerCommonData.Host_App_Path, getCanonicalPath(emulatorPath));			
diff -r 125f1619c573 -r cc0961d7c88d qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtFilter.java
--- a/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtFilter.java	Mon Jan 25 10:09:23 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtFilter.java	Mon Jan 25 10:09:42 2010 -0600
@@ -28,7 +28,7 @@
 
 		if (context.getPlatformString().equals(ISymbianBuildContext.EMULATOR_PLATFORM)) {
 			return context.getSDK().getReleaseRoot().append(context.getPlatformString()).
-			append(context.getTargetString()).append("qtcore.lib").toFile(); //$NON-NLS-1$
+			append(context.getTargetString()).append("QtCore.dll").toFile(); //$NON-NLS-1$
 		} else {
 			// for non-emulator targets, check in the armv5/lib directory (ARMV5 and GCCE)
 			return context.getSDK().getReleaseRoot().append("armv5/lib/qtcore.lib").toFile(); //$NON-NLS-1$