--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java Thu May 06 16:01:37 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java Thu May 06 16:24:10 2010 -0500
@@ -116,14 +116,14 @@
Map<String, String> envMods = new HashMap<String, String>();
envMods.put("EPOCROOT", epocroot.setDevice(null).toOSString());
+ newProject.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, Boolean.valueOf(proFileSelectionPage.useSBSv2Builder()));
+
// run qmake
String errMsg = QMakeRunner.runQMake(newProject, envMods, monitor);
if (errMsg != null) {
throw new CoreException(new Status(IStatus.ERROR, QtUIPlugin.PLUGIN_ID, errMsg));
}
- newProject.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, Boolean.valueOf(proFileSelectionPage.useSBSv2Builder()));
-
ProjectCorePlugin.postProjectCreatedActions(newProject, "bld.inf", selectedConfigs, new ArrayList<String>(0), "", null, monitor); //$NON-NLS-1$ //$NON-NLS-2$
ProjectUIPlugin.projectCreated(newProject);
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java Thu May 06 16:01:37 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java Thu May 06 16:24:10 2010 -0500
@@ -273,7 +273,7 @@
if (builderComposite != null) {
return builderComposite.useSBSv2Builder();
}
- return false;
+ return true;
}
public void saveDialogSettings() {