# HG changeset patch
# User timkelly
# Date 1270759635 18000
# Node ID 090abdc9b9eebde2c4734da9889bea738ffad226
# Parent  8c32afc8c881efaa8c63b2318253316283be243b# Parent  9d05552239c24f4e884ffbfe5aea8b3111404d42
merge commit

diff -r 9d05552239c2 -r 090abdc9b9ee core/com.nokia.carbide.cpp-feature/feature.xml
--- 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"