Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2019-06-06 12:02:50 -0400
committerDoug Schaefer2019-06-06 13:40:12 -0400
commitb9c9c44ac27335403de166022a142f748e88689c (patch)
tree04c563e9aa903cbaa65fd5218f7dcfa548feece8
parentaeaf678425bb2abba3d2134cc52bdfb8d94fcf94 (diff)
downloadorg.eclipse.cdt-b9c9c44ac27335403de166022a142f748e88689c.tar.gz
org.eclipse.cdt-b9c9c44ac27335403de166022a142f748e88689c.tar.xz
org.eclipse.cdt-b9c9c44ac27335403de166022a142f748e88689c.zip
Bug 548010 - Add support for Qt for linux-g++
We had linux-g++-64. But with Ubuntu 18.04, when you install Qt5 you end up with linux-g++. This simply add that and doesn't specify the architecture so should work for both 32 and 64 bit. Change-Id: Ia458e212ff53638496a7108f58b212ef96296afd
-rw-r--r--qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF2
-rw-r--r--qt/org.eclipse.cdt.qt.core/plugin.xml7
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java4
3 files changed, 11 insertions, 2 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
index 58224d92b9..2420809e81 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.qt.core;singleton:=true
-Bundle-Version: 2.2.1.qualifier
+Bundle-Version: 2.2.100.qualifier
Bundle-Activator: org.eclipse.cdt.internal.qt.core.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index a65f85d43a..8491d57449 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -163,5 +163,12 @@
value="x86_64">
</property>
</mapping>
+ <mapping
+ spec="linux-g++">
+ <property
+ key="os"
+ value="linux">
+ </property>
+ </mapping>
</extension>
</plugin>
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java
index d35c515168..7e5407ae62 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java
@@ -162,7 +162,9 @@ public class QtInstallManager implements IQtInstallManager {
}
for (Entry<String, String> property : install.getProperties().entrySet()) {
- if (!property.getValue().equals(toolChain.getProperty(property.getKey()))) {
+ String tcValue = toolChain.getProperty(property.getKey());
+ // Treat null as a wildcard
+ if (tcValue != null && !property.getValue().equals(tcValue)) {
return false;
}
}

Back to the top