merge commit
authortimkelly
Tue, 14 Sep 2010 15:25:12 -0500
changeset 2006 14c0473916ef
parent 2004 b0ce6e39e2d0 (current diff)
parent 2005 6922af2e1b8a (diff)
child 2007 283cfb261d8f
merge commit
--- 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$
 		}
 	}