From b9c9c44ac27335403de166022a142f748e88689c Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Thu, 6 Jun 2019 12:02:50 -0400 Subject: [PATCH] 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 --- qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF | 2 +- qt/org.eclipse.cdt.qt.core/plugin.xml | 7 +++++++ .../org/eclipse/cdt/internal/qt/core/QtInstallManager.java | 4 +++- 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 58224d92b92..2420809e811 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 a65f85d43a3..8491d574499 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"> + + + + 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 d35c5151681..7e5407ae623 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 boolean supports(IQtInstall install, IToolChain toolChain) { } for (Entry 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; } }