Temporarily add earlystartup. Will be replaced by extension point implementation in sdk.core plugin.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/qt/com.nokia.carbide.cpp.qt.core/plugin.xml Thu Feb 11 10:47:37 2010 -0600
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.ui.startup">
+ </extension>
+
+</plugin>
\ No newline at end of file
--- a/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml Thu Feb 11 07:51:25 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/plugin.xml Thu Feb 11 10:47:37 2010 -0600
@@ -87,5 +87,9 @@
class="com.nokia.carbide.cpp.internal.qt.ui.QMakeEnvironmentModifier">
</modifier>
</extension>
+
+ <extension
+ point="org.eclipse.ui.startup">
+ </extension>
</plugin>
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java Thu Feb 11 07:51:25 2010 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/QtUIPlugin.java Thu Feb 11 10:47:37 2010 -0600
@@ -157,7 +157,8 @@
if (project != null && QtCorePlugin.isQtProject(project)) {
try {
String qtSDKName = QtSDKUtils.getQtSDKNameForSymbianSDK(currentConfig.getSDK());
- if (qtSDKName == null || QtSDKUtils.getDefaultQtSDKForProject(project).equals(QtSDKUtils.QT_DEFAULT_SDK_NAME)) {
+ // If qtSDK is not internally installed or <Default> is set, don't change anything
+ if (qtSDKName == null || QtSDKUtils.getDefaultQtSDKForProject(project) == null) {
return;
}