# HG changeset patch # User timkelly # Date 1273181050 18000 # Node ID 59d61a845b294995cbb58cd3a0e25492aecb4d6a # Parent 66a08198aa52a52675e8303547580dd273666c55 fixed bug 11240 diff -r 66a08198aa52 -r 59d61a845b29 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java --- 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 envMods = new HashMap(); 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(0), "", null, monitor); //$NON-NLS-1$ //$NON-NLS-2$ ProjectUIPlugin.projectCreated(newProject); diff -r 66a08198aa52 -r 59d61a845b29 qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileSelectionPage.java --- 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() {