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
eclipse-cdt · Jun 6, 2019 · b9c9c44 · b9c9c44
1 parent aeaf678
commit b9c9c44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 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
@@ -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
@@ -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
@@ -162,7 +162,9 @@ public boolean supports(IQtInstall install, IToolChain toolChain) {
 			}
 
 			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;
 				}
 			}