# HG changeset patch # User Ed Swartz # Date 1258391510 21600 # Node ID aa7a8dc8006aaf702c2323add137f5047e74b676 # Parent 7dbb2f97454afeaed35fdea49791d6ede9dc33ab Remove hard dependency on Qt plugins; make their resolution optional. Without this, most of Carbide fails to load if any Qt plugin is missing. diff -r 7dbb2f97454a -r aa7a8dc8006a qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF --- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Mon Nov 16 11:09:45 2009 -0600 +++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Mon Nov 16 11:11:50 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" + com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: com.nokia.carbide.cpp.internal.qt.core diff -r 7dbb2f97454a -r aa7a8dc8006a qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF --- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Mon Nov 16 11:09:45 2009 -0600 +++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Mon Nov 16 11:11:50 2009 -0600 @@ -22,7 +22,7 @@ com.nokia.carbide.cdt.builder, org.eclipse.cdt.core, org.eclipse.ui.ide, - com.trolltech.qtcppproject;bundle-version="1.5.0" + com.trolltech.qtcppproject;bundle-version="1.5.0";resolution:=optional Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: com.trolltech.qtcppproject,