# HG changeset patch
# User timkelly
# Date 1256153288 18000
# Node ID 37c8331f98f7ed6f296be470027ea1e7a2fcc7fc
# Parent  99a1b28cd34c4cf6897e428a25c7ff668bc3221a# Parent  6f1a6fa739006e549b749b60f351cb1eae2f0406
merge commit

diff -r 99a1b28cd34c -r 37c8331f98f7 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed Oct 21 13:12:16 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Wed Oct 21 14:28:08 2009 -0500
@@ -44,6 +44,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Display;
 
@@ -63,6 +64,7 @@
 import com.nokia.carbide.cdt.internal.builder.ICarbideBuilder;
 import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
 import com.nokia.carbide.cdt.internal.builder.ui.MMPSelectionDialog;
+import com.nokia.carbide.cdt.internal.builder.ui.Messages;
 import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
 import com.nokia.carbide.cpp.epoc.engine.PKGViewRunnableAdapter;
@@ -72,6 +74,7 @@
 import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPData;
 import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPResource;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.AcceptedNodesViewFilter;
+import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
 import com.nokia.carbide.cpp.internal.x86build.X86BuildPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.EPKGLanguage;
@@ -1210,14 +1213,44 @@
     	monitor.done();
     }
     
-    private static void buildSisFile(ISISBuilderInfo sisInfo, ICarbideBuildConfiguration config, CarbideCommandLauncher cmdLauncher, IProgressMonitor monitor, boolean createOutputFromPKGFileName) {
+    private static void buildSisFile(final ISISBuilderInfo sisInfo, final ICarbideBuildConfiguration config, CarbideCommandLauncher cmdLauncher, IProgressMonitor monitor, boolean createOutputFromPKGFileName) {
 		IPath pkgPath = sisInfo.getPKGFullPath();
     	if (pkgPath == null) {
    			cmdLauncher.writeToConsole("PKG file does not exist.  Skipping...");
     		return;
     	} else if (!pkgPath.toFile().exists()) {
-   			cmdLauncher.writeToConsole("PKG file" + pkgPath.toOSString() + " does not exist.  Skipping...");
-    		return;
+    		
+    		try {
+    			// Check to see if this is a Qt project and if the template format could have changed.
+    			IProject project = config.getCarbideProject().getProject();
+				if (project != null && project.hasNature(QtCorePlugin.QT_PROJECT_NATURE_ID)){
+					final String currentPKGName = pkgPath.lastSegment();
+					pkgPath = pkgPath.removeLastSegments(1).append(project.getName() + "_template.pkg" ); //$NON-NLS-N$
+					if (pkgPath.toFile().exists()){
+						
+						final IPath finalPkgPath = pkgPath;
+						Display.getDefault().syncExec(new Runnable() {
+							public void run() {
+								if (true == MessageDialog.openQuestion(WorkbenchUtils.getSafeShell(), "Can not find PKG file for SIS builder", "The file \"" + currentPKGName + "\" does not exist for this Qt project. The suggested file is \"" + finalPkgPath.lastSegment() + "\".\n\nDo you want to update your build configuration to use this PKG file?")) { //$NON-NLS-1$ //$NON-NLS-2$
+									IWorkspace workspace= ResourcesPlugin.getWorkspace();
+									IFile ifile= workspace.getRoot().getFileForLocation(finalPkgPath); 
+									sisInfo.setPKGFile(ifile.getLocation().toOSString());
+									config.getSISBuilderInfoList().remove(sisInfo);
+									config.getSISBuilderInfoList().add(sisInfo);
+									config.saveConfiguration(false);
+								} 
+							}
+						});
+					} 
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+    		
+			if (!sisInfo.getPKGFullPath().toFile().exists()){
+				cmdLauncher.writeToConsole("PKG file " + pkgPath.toOSString() + " does not exist.  Skipping..."); //$NON-NLS-N$
+   				return;
+			}
     	}
     	
     	// see if we need to rebuild the sis file
diff -r 99a1b28cd34c -r 37c8331f98f7 core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs
--- a/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Wed Oct 21 13:12:16 2009 -0500
+++ b/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Wed Oct 21 14:28:08 2009 -0500
@@ -1,5 +1,4 @@
-#Tue May 09 11:29:12 CDT 2006
+#Wed Oct 21 14:27:41 CDT 2009
 eclipse.preferences.version=1
 encoding/about.ini=UTF-8
-encoding/config.ini=UTF-8
 encoding/plugin_customization.ini=UTF-8