From 74c21f54275c66571ad5f76a80d9d8edc4e315dc Mon Sep 17 00:00:00 2001
From: Matthew Bastien <mbastien@blackberry.com>
Date: Wed, 23 Sep 2015 16:51:29 -0400
Subject: [PATCH] Bug 478231 - Hook up .qrc files to the XML Editor

Change-Id: I41b8e07474b608d8311fbc3f117f9386e73b5305
Signed-off-by: Matthew Bastien <mbastien@blackberry.com>
---
 qt/org.eclipse.cdt.qt.core/plugin.properties  | 1 +
 qt/org.eclipse.cdt.qt.core/plugin.xml         | 7 +++++++
 releng/org.eclipse.cdt.target/cdt-e4.6.target | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/qt/org.eclipse.cdt.qt.core/plugin.properties b/qt/org.eclipse.cdt.qt.core/plugin.properties
index b66c9d0ff85..586b8f35797 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.properties
+++ b/qt/org.eclipse.cdt.qt.core/plugin.properties
@@ -9,5 +9,6 @@ providerName=Eclipse CDT
 
 qtProjectFile.name = Qt Project File
 qmlFile.name = QML File
+qrcFile.name = Qt Resource Collection File
 qmakeEnvProvider.name = QMake Environment Provider
 QtInstallHeaders.pathProvider.name = Qt Installed Headers
diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index 4c7e0cd7d39..6815519847a 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -35,6 +35,13 @@
             name="%qmlFile.name"
             priority="normal">
       </content-type>
+      <content-type
+            base-type="org.eclipse.core.runtime.xml"
+            file-extensions="qrc"
+            id="qrcFile"
+            name="%qrcFile.name"
+            priority="normal">
+      </content-type>
    </extension>
    <extension
          id="qtNature"
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.6.target b/releng/org.eclipse.cdt.target/cdt-e4.6.target
index 3ed547c1887..ab0a1c40c2d 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.6.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.6.target
@@ -55,6 +55,10 @@
 <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>