--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Mon Dec 07 09:37:04 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Mon Dec 07 09:37:42 2009 -0600
@@ -41,6 +41,11 @@
private static final String SDK_FEATURE_SUBDIR = "epoc32/kit/feature"; //$NON-NLS-1$
public static void checkForNewlyInstalledPlugins(final IWorkbench workbench){
+
+ if (WorkbenchUtils.isJUnitRunning()){
+ return;
+ }
+
final List<ISymbianSDK> sdkList = SDKCorePlugin.getSDKManager().getSDKList();
Job job = new Job("Checking installed SDKs for plugins") {
@Override
--- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Mon Dec 07 09:37:04 2009 -0600
+++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Mon Dec 07 09:37:42 2009 -0600
@@ -11,7 +11,7 @@
org.eclipse.jface,
com.nokia.carbide.cpp.sdk.core,
com.nokia.carbide.cpp.sdk.ui,
- com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional
+ com.trolltech.qtcppproject;bundle-version="1.6.0";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: com.nokia.carbide.cpp.internal.qt.core