merge commit RCL_2_4
authortimkelly
Thu, 08 Apr 2010 15:47:15 -0500
branchRCL_2_4
changeset 1182 090abdc9b9ee
parent 1180 8c32afc8c881 (diff)
parent 1181 9d05552239c2 (current diff)
child 1191 0523013ddf00
merge commit
--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Thu Apr 08 15:42:52 2010 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Thu Apr 08 15:47:15 2010 -0500
@@ -630,30 +630,6 @@
          unpack="false"/>
 
    <plugin
-         id="com.trolltech.qtcpp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.trolltech.qtcppproject"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.trolltech.qtcppproject.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="com.nokia.carbide.cpp.news.reader"
          download-size="0"
          install-size="0"