# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1260200262 21600
# Node ID 6b4b5a8759fb5fcc07915a71c6917ab0bd640a7a
# Parent  404bbc8b47b4b9696b30262d9600a50903d64975# Parent  421b1531a1354f2949ca9e4a1eece8ad1c3e5f07
Merge commit

diff -r 404bbc8b47b4 -r 6b4b5a8759fb core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java
--- 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
diff -r 404bbc8b47b4 -r 6b4b5a8759fb qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF
--- 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