From ea0064b77b75840ed423db534042583a59866ef7 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 28 Jan 2016 13:14:32 -0500 Subject: [PATCH] Qt - fix up build.properties files to pick things up properly. Was including too much of tern-qml and missing the qt icons. --- qt/org.eclipse.cdt.qt.core/build.properties | 7 +++++-- .../src/org/eclipse/cdt/internal/qt/core/QMLAnalyzer.java | 2 +- qt/org.eclipse.cdt.qt.ui/build.properties | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qt/org.eclipse.cdt.qt.core/build.properties b/qt/org.eclipse.cdt.qt.core/build.properties index 9ed86a510f5..acc5c808946 100644 --- a/qt/org.eclipse.cdt.qt.core/build.properties +++ b/qt/org.eclipse.cdt.qt.core/build.properties @@ -3,8 +3,11 @@ bin.includes = META-INF/,\ templates/,\ about.html,\ plugin.properties,\ - .,\ - tern-qml/ + tern-qml/dist/,\ + tern-qml/qml-nsh.js,\ + tern-qml/qml.js,\ + tern-qml/ecma5-defs.js, \ + . src.includes = about.html,\ schema/ source.. = src/ diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QMLAnalyzer.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QMLAnalyzer.java index 8e559327234..4a9ac6249c7 100644 --- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QMLAnalyzer.java +++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QMLAnalyzer.java @@ -119,7 +119,7 @@ public class QMLAnalyzer implements IQMLAnalyzer { try { return load(file); } catch (FileNotFoundException e) { - return load(file.replaceAll("^/tern-qml/node_modules/", "/tern-qml/dist/")); + return load(file.replace("/tern-qml/node_modules/", "/tern-qml/dist/")); } } diff --git a/qt/org.eclipse.cdt.qt.ui/build.properties b/qt/org.eclipse.cdt.qt.ui/build.properties index bc3b0f2bf1f..060c9116457 100644 --- a/qt/org.eclipse.cdt.qt.ui/build.properties +++ b/qt/org.eclipse.cdt.qt.ui/build.properties @@ -4,4 +4,5 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ plugin.properties,\ - about.html + about.html,\ + icons/