From 854f036c61520839a28e156973d4dad17bc81900 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <cdtdoug@gmail.com>
Date: Tue, 17 May 2016 14:42:10 -0400
Subject: [PATCH] [Qt] Remove unused extension. Make QML Analyzer loading a
 system job.

Also more clean up of the Qt Hello World template.

Change-Id: I8dd862140e9e641005809f5b523e332b6bf496bd
---
 qt/org.eclipse.cdt.qt.core/plugin.xml         | 22 -------------------
 .../cdt/internal/qt/core/Activator.java       |  6 +++--
 .../templates/project2/appProject/main.cpp    | 11 +++++-----
 .../templates/project2/appProject/main.qrc    |  6 ++---
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index b02eec7544a..56757c60dc8 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -76,15 +76,6 @@
             id="Qt"
             class="org.eclipse.cdt.internal.qt.core.pdom.PDOMQtLinkageFactory"/>
     </extension>
-    <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-        <provider
-            class="org.eclipse.cdt.internal.qt.core.QtIncludePathsProvider"
-            id="org.eclipse.cdt.qt.core.QtPathsProvider"
-            name="%QtInstallHeaders.pathProvider.name"
-            prefer-non-shared="false">
-            <language-scope id="org.eclipse.cdt.core.g++"/>
-        </provider>
-    </extension>
     <extension point="org.eclipse.core.expressions.definitions">
         <definition id="org.eclipse.cdt.qt.core.isQtProject">
             <with variable="projectNatures">
@@ -123,19 +114,6 @@
         <super type="org.eclipse.cdt.codan.core.codanProblem"/> 
         <persistent value="true"/>
     </extension>
-    <extension
-          id="qtBuilder"
-          name="Qt Builder"
-          point="org.eclipse.core.resources.builders">
-       <builder
-             callOnEmptyDelta="true"
-             hasNature="true"
-             isConfigurable="true"
-             supportsConfigurations="true">
-          <run
-                class="org.eclipse.cdt.internal.qt.core.build.QtBuilder">
-          </run></builder>
-    </extension>
     <extension
           point="org.eclipse.launchbar.core.launchBarContributions">
        <descriptorType
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Activator.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Activator.java
index 5739000726d..914046cfa38 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Activator.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Activator.java
@@ -62,7 +62,7 @@ public class Activator extends Plugin {
 
 		QMLAnalyzer qmlAnalyzer = new QMLAnalyzer();
 		context.registerService(IQMLAnalyzer.class, qmlAnalyzer, null);
-		new Job("Load QML Analyzer") { //$NON-NLS-1$
+		Job startupJob = new Job("Load QML Analyzer") { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
@@ -72,7 +72,9 @@ public class Activator extends Plugin {
 				}
 				return Status.OK_STATUS;
 			}
-		}.schedule();
+		};
+		startupJob.setSystem(true);
+		startupJob.schedule();
 	}
 
 	@Override
diff --git a/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.cpp b/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.cpp
index b753bc9a3eb..b3e29a3b85e 100644
--- a/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.cpp
+++ b/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.cpp
@@ -1,12 +1,11 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-int main(int argc, char *argv[])
-{
-    QGuiApplication app(argc, argv);
+int main(int argc, char *argv[]) {
+	QGuiApplication app(argc, argv);
 
-    QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:/src/${projectName}.qml")));
+	QQmlApplicationEngine engine;
+	engine.load(QUrl(QStringLiteral("qrc:/src/${projectName}.qml")));
 
-    return app.exec();
+	return app.exec();
 }
diff --git a/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.qrc b/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.qrc
index b86034ea7a5..30335ce99ed 100644
--- a/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.qrc
+++ b/qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/">
-        <file>src/${projectName}.qml</file>
-    </qresource>
+	<qresource prefix="/">
+		<file>src/${projectName}.qml</file>
+	</qresource>
 </RCC>