# HG changeset patch
# User timkelly
# Date 1272381538 18000
# Node ID 76455ae5d5fdc1fc2c6efe1ee2f281957bf7d9b5
# Parent  be3d8ca5bafea64f118fa6d269c3c06bdf00f6b9
glitch on bug 11131. check the new qmake location to avoid adding duplicate Qt SDKs at IDE start-up

diff -r be3d8ca5bafe -r 76455ae5d5fd 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:53:16 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtSDKUtils.java	Tue Apr 27 10:18:58 2010 -0500
@@ -95,7 +95,8 @@
 	static public String getQtSDKNameForSymbianSDK(ISymbianSDK sdk){
 		
 		String epocRoot = sdk.getEPOCROOT();
-		File qtBinPath = new Path(epocRoot).append(OLD_QT_SDK_BIN_PATH).toFile();
+		File oldQtBinPath = new Path(epocRoot).append(OLD_QT_SDK_BIN_PATH).toFile();
+		File newQtBinPath = new Path(epocRoot).append(QT_SDK_PATH).toFile();
 		File qtIncPath = new Path(epocRoot).append(QT_SDK_INC_PATH).toFile();
 		
 		refreshQtStoredSDKs();
@@ -108,7 +109,8 @@
 			File currBinPath = new File(qtSDK.binPath);
 			File currIncPath = new File(qtSDK.incPath);
 			
-			if (currBinPath.equals(qtBinPath) && currIncPath.equals(qtIncPath)){
+			if ( (currBinPath.equals(oldQtBinPath) && currIncPath.equals(qtIncPath)) ||
+				 (currBinPath.equals(newQtBinPath) && currIncPath.equals(qtIncPath))){
 				return qtSDK.name;
 			}
 		}