From 557839783c1bc1acbda3886b45d777007134de83 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Thu, 26 Sep 2013 11:28:55 -0400
Subject: [PATCH] Bug 418098 - Added toolchain keywords to some more
 properties/preferences pages

---
 .../plugin.xml                                | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 59be74b7713..ba312a5b556 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -49,7 +49,14 @@
             name="%NewCDTWizardPref.name"
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
-            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard">
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1">
+         </keywordReference>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2">
+         </keywordReference>
+      </page>
       <page
             category="org.eclipse.cdt.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
@@ -563,6 +570,12 @@
 	                  value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
            </adapt>
          </enabledWhen>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1">
+         </keywordReference>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2">
+         </keywordReference>
       </page>
       <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
@@ -579,6 +592,12 @@
                 <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.toolchain.modification.disable=false"/>
 		    </and>          
          </enabledWhen>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1">
+         </keywordReference>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2">
+         </keywordReference>
       </page>
 
       <page