# HG changeset patch
# User timkelly
# Date 1282931013 18000
# Node ID e1859c9e46882f9be040c10202c00cbc5c89e903
# Parent  8aca9dfa10ceb55c20a08c0b80e03184bec52d40
check for both qmake install locations. was preiously just checking the old location when internally installed

diff -r 8aca9dfa10ce -r e1859c9e4688 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Fri Aug 27 11:41:08 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Fri Aug 27 12:43:33 2010 -0500
@@ -54,7 +54,10 @@
 
 	private static final String EMPTY_DEVICES_XML_CONTENT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><devices version=\"1.0\"></devices>";
 
+	/** Older kits put qmake under the tools/qt folder. */
 	private static final String QMAKE_FILE = "epoc32/tools/qt/qmake" + HostOS.EXE_EXT; //$NON-NLS-1$
+	/** Newer kits put qmake under the tools folder */
+	private static final String QMAKE_FILE_LOCATION2 = "epoc32/tools/qmake" + HostOS.EXE_EXT; //$NON-NLS-1$
 	private static final String MIFCONV_FILE = "epoc32/tools/mifconv" + HostOS.EXE_EXT; //$NON-NLS-1$
 	private static final String ABLD_FILE = "epoc32/tools/abld.pl"; //$NON-NLS-1$
 	private static final long VALID_ABLD_SIZE = 1024;
@@ -440,10 +443,17 @@
 	}
 
 	private boolean hasQmake(ISymbianSDK sdk) {
-		File qmake = new File(sdk.getEPOCROOT(), QMAKE_FILE);
+		File qmake = new File(sdk.getEPOCROOT(), QMAKE_FILE_LOCATION2);
 		if (qmake.exists()) {
 			return true;
 		}
+		
+		// try alternate (old) location
+		qmake = new File(sdk.getEPOCROOT(), QMAKE_FILE);
+		if (qmake.exists()) {
+			return true;
+		}
+		
 		return false;
 	}