# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1264114559 21600
# Node ID 7395fd14bbe101dfa7eb0e6eb7e091f3613fbf3d
# Parent  8c7fa6db96c0ac483159f339c2869272fb1ba903# Parent  aedbee09433665fad650cb10dd940a279f67910b
Merge commit

diff -r 8c7fa6db96c0 -r 7395fd14bbe1 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	Wed Jan 20 09:05:38 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtFilter.java	Thu Jan 21 16:55:59 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$