# HG changeset patch
# User timkelly
# Date 1284495912 18000
# Node ID 14c0473916ef148f3096195876f5ffac6592ba30
# Parent  b0ce6e39e2d06d89b1d306a90cd6dfc7cbd03672# Parent  6922af2e1b8a00facb03240d0a2ee7af3f1fb414
merge commit

diff -r b0ce6e39e2d0 -r 14c0473916ef 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	Tue Sep 14 15:07:16 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtFilter.java	Tue Sep 14 15:25:12 2010 -0500
@@ -33,7 +33,7 @@
 			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 releaseRoot.append("armv5/lib/QtCore.lib").toFile(); //$NON-NLS-1$
+			return releaseRoot.append("armv5/lib/QtCore.dso").toFile(); //$NON-NLS-1$
 		}
 	}