Cleanup Core Build Preference pages.

Move Toolchains directly under C/C++ and rename to Core
Build Toolchains. Add a label describing what the toolchains
are for in hope of avoiding confusion with managed build.
Also move Qt into C/C++.

Change-Id: Ia1d76087c65b26562d1001243ea355c7ac32365e

8 files changed, 19 insertions, 8 deletions

diff --git a/build/org.eclipse.cdt.cmake.ui/plugin.properties b/build/org.eclipse.cdt.cmake.ui/plugin.properties
index d0466c4342a..e4c6c7270fa 100644
--- a/build/org.eclipse.cdt.cmake.ui/plugin.properties
+++ b/build/org.eclipse.cdt.cmake.ui/plugin.properties
@@ -7,4 +7,3 @@
 ###############################################################################
 
 cmake.preferences.name = CMake
-toolchains.preferences.name = Toolchains
diff --git a/build/org.eclipse.cdt.cmake.ui/plugin.xml b/build/org.eclipse.cdt.cmake.ui/plugin.xml
index 781213fbb00..042d05e8d13 100644
--- a/build/org.eclipse.cdt.cmake.ui/plugin.xml
+++ b/build/org.eclipse.cdt.cmake.ui/plugin.xml
@@ -28,12 +28,6 @@
             id="org.eclipse.cdt.cmake.ui.page1"
             name="%cmake.preferences.name">
       </page>
-      <page
-            category="org.eclipse.cdt.cmake.ui.page1"
-            class="org.eclipse.cdt.ui.build.ToolChainPreferencePage"
-            id="org.eclipse.cdt.cmake.ui.page.toolchains"
-            name="%toolchains.preferences.name">
-      </page>
    </extension>
    <extension
          point="org.eclipse.tools.templates.ui.templates">
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 65d5a89661d..0e0288932ab 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -674,3 +674,5 @@ RefreshExclusionContributorExtensionPoint = Refresh Exclusion Contributor
 semanticHighlightingExtensionPoint = Semantic Highlighting Extension Point
 
 UserSettingEntries.name = CDT User Setting Entries
+
+toolchains.preferences.name = Core Build Toolchains
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 1238dad5ed8..904df5b5528 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -5030,5 +5030,14 @@
        </adapter>
     </factory>
  </extension>
+ <extension
+       point="org.eclipse.ui.preferencePages">
+       <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.cdt.ui.build.ToolChainPreferencePage"
+            id="org.eclipse.cdt.cmake.ui.page.toolchains"
+            name="%toolchains.preferences.name">
+      </page>
+ </extension>
 
 </plugin>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
index a33b9789ac7..730745f5a61 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
@@ -69,6 +69,7 @@ public final class CUIMessages extends NLS {
 	public static String ToolChainPreferencePage_Arch;
 	public static String ToolChainPreferencePage_AreYouSure;
 	public static String ToolChainPreferencePage_AvailableToolchains;
+	public static String ToolChainPreferencePage_Desc;
 	public static String ToolChainPreferencePage_Down;
 	public static String ToolChainPreferencePage_Edit;
 	public static String ToolChainPreferencePage_EditDot;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
index 4f9c0203453..a0a6cb3f1ab 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
@@ -69,6 +69,7 @@ ToolChainPreferencePage_Add=Add...
 ToolChainPreferencePage_Arch=Arch
 ToolChainPreferencePage_AreYouSure=Are you sure you'd like to remove the selected toolchain?
 ToolChainPreferencePage_AvailableToolchains=Available Toolchains
+ToolChainPreferencePage_Desc=Toolchains for use with CMake, Qt, and Core Build Makefile projects.
 ToolChainPreferencePage_Down=Down
 ToolChainPreferencePage_Edit=Edit
 ToolChainPreferencePage_EditDot=Edit...
@@ -78,7 +79,7 @@ ToolChainPreferencePage_OS=OS
 ToolChainPreferencePage_Remove=Remove
 ToolChainPreferencePage_Remove1=Remove
 ToolChainPreferencePage_RemoveToolchain=Remove Toolchain
-ToolChainPreferencePage_Toolchains=Toolchains
+ToolChainPreferencePage_Toolchains=Core Build Toolchains
 ToolChainPreferencePage_Type=Type
 ToolChainPreferencePage_Up=Up
 ToolChainPreferencePage_UserDefinedToolchains=User Defined Toolchains
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
index 75964cc2bc3..798c1f8fdc7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
@@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbench;
@@ -116,6 +117,9 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
 		Composite control = new Composite(parent, SWT.NONE);
 		control.setLayout(new GridLayout());
 
+		Label label = new Label(control, SWT.NONE);
+		label.setText(CUIMessages.ToolChainPreferencePage_Desc);
+
 		Group availGroup = new Group(control, SWT.NONE);
 		availGroup.setText(CUIMessages.ToolChainPreferencePage_AvailableToolchains);
 		availGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
diff --git a/qt/org.eclipse.cdt.qt.ui/plugin.xml b/qt/org.eclipse.cdt.qt.ui/plugin.xml
index c301bbb42ca..58d4f44329d 100644
--- a/qt/org.eclipse.cdt.qt.ui/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.ui/plugin.xml
@@ -63,6 +63,7 @@
     <extension
           point="org.eclipse.ui.preferencePages">
        <page
+             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
              class="org.eclipse.cdt.internal.qt.ui.preferences.QtPreferencePage"
              id="org.eclipse.cdt.qt.ui.preferencePage.qt"
              name="%preferences.qt.name">