mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

[Qt] Remove unused extension. Make QML Analyzer loading a system job.

Browse source 
Also more clean up of the Qt Hello World template.

Change-Id: I8dd862140e9e641005809f5b523e332b6bf496bd
This commit is contained in:
Doug Schaefer 2016-05-17 14:42:10 -04:00
parent 8f0ca866c4
commit 854f036c61
4 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
qt/org.eclipse.cdt.qt.core/plugin.xml
View file

@ -76,15 +76,6 @@
id="Qt" id="Qt"
class="org.eclipse.cdt.internal.qt.core.pdom.PDOMQtLinkageFactory"/> class="org.eclipse.cdt.internal.qt.core.pdom.PDOMQtLinkageFactory"/>
</extension> </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"> <extension point="org.eclipse.core.expressions.definitions">
<definition id="org.eclipse.cdt.qt.core.isQtProject"> <definition id="org.eclipse.cdt.qt.core.isQtProject">
<with variable="projectNatures"> <with variable="projectNatures">
@ -123,19 +114,6 @@
<super type="org.eclipse.cdt.codan.core.codanProblem"/> <super type="org.eclipse.cdt.codan.core.codanProblem"/>
<persistent value="true"/> <persistent value="true"/>
</extension> </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 <extension
point="org.eclipse.launchbar.core.launchBarContributions"> point="org.eclipse.launchbar.core.launchBarContributions">
<descriptorType <descriptorType

6
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Activator.java
View file

@ -62,7 +62,7 @@ public class Activator extends Plugin {
QMLAnalyzer qmlAnalyzer = new QMLAnalyzer(); QMLAnalyzer qmlAnalyzer = new QMLAnalyzer();
context.registerService(IQMLAnalyzer.class, qmlAnalyzer, null); 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 @Override
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
try { try {
@ -72,7 +72,9 @@ public class Activator extends Plugin {
} }
return Status.OK_STATUS; return Status.OK_STATUS;
} }
}.schedule(); };
startupJob.setSystem(true);
startupJob.schedule();
} }
@Override @Override

11
qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.cpp
View file

@ -1,12 +1,11 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{ QGuiApplication app(argc, argv);
QGuiApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.load(QUrl(QStringLiteral("qrc:/src/${projectName}.qml"))); engine.load(QUrl(QStringLiteral("qrc:/src/${projectName}.qml")));
return app.exec(); return app.exec();
} }

6
qt/org.eclipse.cdt.qt.core/templates/project2/appProject/main.qrc
View file

@ -1,5 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>src/${projectName}.qml</file> <file>src/${projectName}.qml</file>
</qresource> </qresource>
</RCC> </RCC>