Merge commit
authorEd Swartz <ed.swartz@nokia.com>
Thu, 21 Jan 2010 16:55:59 -0600
changeset 800 7395fd14bbe1
parent 799 8c7fa6db96c0 (current diff)
parent 792 aedbee094336 (diff)
child 802 4e9e4ef7c1a0
Merge commit
--- 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$