# HG changeset patch
# User timkelly
# Date 1272381829 18000
# Node ID 5e60bd1096621e6ca5f720c486fbe4fbe8805c89
# Parent  9b50c8036532fbf3ff8a7bb87ab922e59d539545
glitch on bug 11131. check the new qmake location to avoid adding duplicate Qt SDKs at IDE start-up

diff -r 9b50c8036532 -r 5e60bd109662 qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtSDKUtils.java
--- a/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtSDKUtils.java	Tue Apr 27 09:07:48 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtSDKUtils.java	Tue Apr 27 10:23:49 2010 -0500
@@ -94,7 +94,8 @@
 	static public String getQtSDKNameForSymbianSDK(ISymbianSDK sdk){
 		
 		String epocRoot = sdk.getEPOCROOT();
-		File qtBinPath = new File (epocRoot + OLD_QT_SDK_BIN_PATH);
+		File oldQtBinPath = new File (epocRoot + OLD_QT_SDK_BIN_PATH);
+		File newQtBinPath = new Path(epocRoot).append(QT_SDK_PATH).toFile();
 		File qtIncPath = new File (epocRoot + QT_SDK_INC_PATH);
 		
 		refreshQtStoredSDKs();
@@ -107,9 +108,10 @@
 			File currBinPath = new File(qtSDK.binPath);
 			File currIncPath = new File(qtSDK.incPath);
 			
-			if (currBinPath.equals(qtBinPath) && currIncPath.equals(qtIncPath)){
-				return qtSDK.name;
-			}
+			if ( (currBinPath.equals(oldQtBinPath) && currIncPath.equals(qtIncPath)) ||
+				 (currBinPath.equals(newQtBinPath) && currIncPath.equals(qtIncPath))){
+					return qtSDK.name;
+				}
 		}
 		
 		return null;