# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1244822685 18000
# Node ID dad65703182b24cc6ec4de12cd9eb4fe411a4d30
# Parent  b04f7c34bdfb57378e32635259de8f341bd96133# Parent  59ed3eda445a3a209906d2684607ff44825ad4b6
merge

diff -r b04f7c34bdfb -r dad65703182b builder/com.nokia.carbide.cpp.builder.utils/plugin.properties
--- a/builder/com.nokia.carbide.cpp.builder.utils/plugin.properties	Fri Jun 12 10:54:49 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/plugin.properties	Fri Jun 12 11:04:45 2009 -0500
@@ -32,3 +32,9 @@
 BuilderUtils.TestCleanExport=test cleanexport
 BuilderUtils.TestExport=test export
 BuilderUtils.TestTarget=test target
+
+#Keywords for Carbide preferences
+carbcPreference.common=carbide symbian c cpp cplusplus
+carbcPreference.preprocess=build console editor arguments cpp
+
+
diff -r b04f7c34bdfb -r dad65703182b builder/com.nokia.carbide.cpp.builder.utils/plugin.xml
--- a/builder/com.nokia.carbide.cpp.builder.utils/plugin.xml	Fri Jun 12 10:54:49 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/plugin.xml	Fri Jun 12 11:04:45 2009 -0500
@@ -9,6 +9,12 @@
             category="com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage"
             class="com.nokia.carbide.cpp.internal.builder.utils.ui.PreprocessPreferencePage"
             id="com.nokia.carbide.cpp.builder.utils.ui.PreprocessPreferencePage">
+         <keywordReference
+               id="com.nokia.carbide.cpp.builder.common">
+         </keywordReference>
+         <keywordReference
+               id="com.nokia.carbide.cpp.builder.preprocess">
+         </keywordReference>
       </page>
    </extension>
 
@@ -748,4 +754,15 @@
 			</command>
 		</menuContribution>
 	</extension>
+ <extension
+       point="org.eclipse.ui.keywords">
+    <keyword
+          id="com.nokia.carbide.cpp.builder.common"
+          label="%carbcPreference.common">
+    </keyword>
+    <keyword
+          id="com.nokia.carbide.cpp.builder.preprocess"
+          label="%carbcPreference.preprocess">
+    </keyword>
+ </extension>
 </plugin>