diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index 9789dc324f2..b99b24c86f8 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -19,6 +19,9 @@
          <toolChain id="cdt.managedbuild.toolchain.gnu.base"/>
          <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base"/>
          <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base"/>
+         <toolChain
+               id="cdt.managedbuild.toolchain.llvm.clang.macosx.base">
+         </toolChain>
       </template>
    </extension>
 </plugin>
diff --git a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile
index 5322ef46d12..86932e1beb6 100644
--- a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile
+++ b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile
@@ -1,13 +1,25 @@
 QMAKE = {{qmake}}
 
-OUTDIR = build
+all:	debug release
 
-$(OUTDIR)/Makefile:
-	@mkdir -p $(OUTDIR)
-	$(QMAKE) -o $(OUTDIR)/Makefile {{baseName}}.pro 
+clean: clean-debug clean-release
 
-all:	$(OUTDIR)/Makefile
-	$(MAKE) -C $(OUTDIR)
+build-debug/Makefile:
+	@mkdir -p $(dir $@)
+	$(QMAKE) -o $@ clangtest.pro CONFIG+=debug 
 
-clean:
-	rm -fr $(OUTDIR)
+debug:	build-debug/Makefile
+	$(MAKE) -w -C build-debug
+
+clean-debug:
+	rm -fr build-debug
+
+build-release/Makefile:
+	@mkdir -p $(dir $@)
+	$(QMAKE) -o $@ clangtest.pro CONFIG+=release 
+
+release:	build-release/Makefile
+	$(MAKE) -w -C build-release
+
+clean-release:
+	rm -fr build-release