1 files changed, 42 insertions, 25 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index e7a5bc5ab1a..d6eb6d5449b 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="qtInstallTargetMapper" name="Qt Install Target Mapper" schema="schema/qtInstallTargetMapper.exsd"/>
+   <extension-point id="qtInstallProvider" name="Qt Install Provider" schema="schema/qtInstallProvider.exsd"/>
+   <extension-point id="qtToolChainMapper" name="Qt ToolChain Mapper" schema="schema/qtToolChainMapper.exsd"/>
 
    <extension
          point="org.eclipse.cdt.core.templates">
@@ -159,30 +160,6 @@
        </configProvider>
     </extension>
     <extension
-          point="org.eclipse.cdt.core.ScannerInfoProvider2">
-       <provider
-             builder="org.eclipse.cdt.qt.core.qtBuilder"
-             class="org.eclipse.cdt.internal.qt.core.build.QtScannerInfoProvider">
-       </provider>
-    </extension>
-    <extension
-          point="org.eclipse.core.runtime.adapters">
-       <factory
-             adaptableType="org.eclipse.core.resources.IBuildConfiguration"
-             class="org.eclipse.cdt.internal.qt.core.build.QtBuildConfigurationFactory">
-          <adapter
-                type="org.eclipse.cdt.qt.core.QtBuildConfiguration">
-          </adapter>
-       </factory>
-    </extension>
-    <extension
-          point="org.eclipse.cdt.qt.core.qtInstallTargetMapper">
-       <mapper
-             class="org.eclipse.cdt.internal.qt.core.LocalQtInstallTargetMapper"
-             targetTypeId="org.eclipse.launchbar.core.launchTargetType.local">
-       </mapper>
-    </extension>
-    <extension
           point="org.eclipse.debug.core.launchConfigurationTypes">
        <launchConfigurationType
              delegate="org.eclipse.cdt.internal.qt.core.launch.QtLocalRunLaunchConfigDelegate"
@@ -204,4 +181,44 @@
              type="org.eclipse.cdt.qt.core.launchConfigurationType">
        </launchDelegate>
     </extension>
+    <extension
+          point="org.eclipse.cdt.core.buildConfigProvider">
+       <provider
+             class="org.eclipse.cdt.internal.qt.core.build.QtBuildConfigurationProvider"
+             id="org.eclipse.cdt.qt.core.qtBuildConfigProvider"
+             natureId="org.eclipse.cdt.qt.core.qtNature">
+       </provider>
+    </extension>
+    <extension
+          point="org.eclipse.cdt.core.toolChainProvider">
+       <provider
+             class="org.eclipse.cdt.qt.core.QtMinGWToolChainProvider">
+       </provider>
+    </extension>
+    <extension
+          point="org.eclipse.cdt.qt.core.qtInstallProvider">
+       <provider
+             class="org.eclipse.cdt.internal.qt.core.provider.Msys2QtInstallProvider">
+       </provider>
+       <provider
+             class="org.eclipse.cdt.internal.qt.core.provider.HomebrewQtInstallProvider">
+       </provider>
+       <provider
+             class="org.eclipse.cdt.internal.qt.core.provider.QtInstallProvider">
+       </provider>
+    </extension>
+    <extension
+          point="org.eclipse.cdt.qt.core.qtToolChainMapper">
+       <mapping
+             spec="macx-clang">
+          <property
+                key="os"
+                value="macosx">
+          </property>
+          <property
+                key="arch"
+                value="x86_64">
+          </property>
+       </mapping>
+    </extension>
 </plugin>