--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/processes/ProjectCreatedTasksQt.java Fri Feb 19 12:52:08 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/processes/ProjectCreatedTasksQt.java Fri Feb 19 17:02:11 2010 -0600
@@ -67,6 +67,18 @@
// set EPOCROOT to the default build config's SDK before calling qmake
List listOfBuildConfigs = (List) template.getTemplateValues().get(SELECTED_BUILD_CONFIGS_VALUE_KEY);
+ // set the default Qt SDK
+ ISymbianSDK sdk = ((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK();
+ String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+ if (qtSDKName == null){
+ QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
+ qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+ }
+
+ if (qtSDKName != null){
+ QtSDKUtils.setDefaultQtSDKForProject(project, qtSDKName);
+ }
+
IPath epocroot = new Path(((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK().getEPOCROOT());
Map<String, String> envMods = new HashMap<String, String>();
envMods.put("EPOCROOT", epocroot.setDevice(null).toOSString());
@@ -85,18 +97,6 @@
// set the qmake generated pkg files to be built
QtUIPlugin.setupSISBuilderSettings(project);
- // set the default Qt SDK
- ISymbianSDK sdk = ((ISymbianBuildContext)listOfBuildConfigs.get(0)).getSDK();
- String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
- if (qtSDKName == null){
- QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
- qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
- }
-
- if (qtSDKName != null){
- QtSDKUtils.setDefaultQtSDKForProject(project, qtSDKName);
- }
-
}
}
}
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java Fri Feb 19 12:52:08 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/QtProFileImportWizard.java Fri Feb 19 17:02:11 2010 -0600
@@ -98,7 +98,19 @@
// enable the pro file listener by default
new QtProject(newProject).setRunQMakeWhenProFileChanges(true);
-
+
+ // Set the default Qt SDK, if any
+ ISymbianSDK sdk = selectedConfigs.get(0).getSDK();
+ String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+ if (qtSDKName == null){
+ QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
+ qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
+ }
+
+ if (qtSDKName != null){
+ QtSDKUtils.setDefaultQtSDKForProject(newProject, qtSDKName);
+ }
+
// set EPOCROOT to the default build config's SDK before calling qmake
IPath epocroot = new Path(selectedConfigs.get(0).getSDK().getEPOCROOT());
Map<String, String> envMods = new HashMap<String, String>();
@@ -122,18 +134,6 @@
// set the qmake generated pkg files to be built
QtUIPlugin.setupSISBuilderSettings(newProject);
- // Set the default Qt SDK, if any
- ISymbianSDK sdk = selectedConfigs.get(0).getSDK();
- String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
- if (qtSDKName == null){
- QtSDKUtils.addQtSDKForSymbianSDK(sdk, false);
- qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(sdk);
- }
-
- if (qtSDKName != null){
- QtSDKUtils.setDefaultQtSDKForProject(newProject, qtSDKName);
- }
-
if (monitor.isCanceled()) {
// the user canceled the import so delete the project
newProject.delete(false, true, null);