# HG changeset patch # User wpaul # Date 1239205324 18000 # Node ID b7d854010c8df9aff7581bb3c099d48de1a18ac5 # Parent e2b416032b5bf5b4ba595d7d79cdeb1123ddaeb7# Parent 27e53e1abc19da8931c71092bed801dafb42dc02 merged diff -r e2b416032b5b -r b7d854010c8d qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF --- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Wed Apr 08 10:40:18 2009 -0500 +++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Wed Apr 08 10:42:04 2009 -0500 @@ -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.4.3" + com.trolltech.qtcppproject;bundle-version="1.5.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: com.nokia.carbide.cpp.internal.qt.core diff -r e2b416032b5b -r b7d854010c8d qt/com.nokia.carbide.cpp.qt.test/META-INF/MANIFEST.MF --- a/qt/com.nokia.carbide.cpp.qt.test/META-INF/MANIFEST.MF Wed Apr 08 10:40:18 2009 -0500 +++ b/qt/com.nokia.carbide.cpp.qt.test/META-INF/MANIFEST.MF Wed Apr 08 10:42:04 2009 -0500 @@ -15,7 +15,7 @@ org.eclipse.core.resources, com.nokia.carbide.cpp.project.core, org.eclipse.cdt.core, - com.trolltech.qtcppproject;bundle-version="1.4.3", + com.trolltech.qtcppproject;bundle-version="1.5.0", com.nokia.carbide.cdt.builder Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff -r e2b416032b5b -r b7d854010c8d qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF --- a/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Wed Apr 08 10:40:18 2009 -0500 +++ b/qt/com.nokia.carbide.cpp.qt.ui/META-INF/MANIFEST.MF Wed Apr 08 10:42:04 2009 -0500 @@ -22,6 +22,6 @@ com.nokia.carbide.cdt.builder, org.eclipse.cdt.core, org.eclipse.ui.ide, - com.trolltech.qtcppproject;bundle-version="1.4.3" + com.trolltech.qtcppproject;bundle-version="1.5.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy