mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 548010 - Add support for Qt for linux-g++

Browse source 
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
This commit is contained in:
Doug Schaefer 2019-06-06 12:02:50 -04:00
parent aeaf678425
commit b9c9c44ac2
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.qt.core;singleton:=true 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-Activator: org.eclipse.cdt.internal.qt.core.Activator
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime, Require-Bundle: org.eclipse.core.runtime,

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

@ -163,5 +163,12 @@
value="x86_64"> value="x86_64">
</property> </property>
</mapping> </mapping>
<mapping
spec="linux-g++">
<property
key="os"
value="linux">
</property>
</mapping>
</extension> </extension>
</plugin> </plugin>

4
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java
View file

@ -162,7 +162,9 @@ public class QtInstallManager implements IQtInstallManager {
} }
for (Entry<String, String> property : install.getProperties().entrySet()) { 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; return false;
} }
} }