Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2016-08-25 19:52:40 +0000
committerGerrit Code Review @ Eclipse.org2016-08-25 20:49:28 +0000
commit50bc082f8413b14cd7f5c5c6b72b493c6e43539e (patch)
tree37d90e309b5620586687398bd01cdd75978da3f8 /qt/org.eclipse.cdt.qt.core/src/org/eclipse
parent6cbe4a684917c9b7d04d23b9313bede705150b95 (diff)
downloadorg.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.tar.gz
org.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.tar.xz
org.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.zip
Bug 174176 - Hook up CMake build to LaunchBar to select toolchain files
Use launch target os and cpu arch properties to pick toolchains and toolchain files. UI to add toolchain files. And build support. Also some clean up of Qt as I found bugs. Change-Id: Icd1da43460b5954eea15e95ed8ec27850fc4e54e
Diffstat (limited to 'qt/org.eclipse.cdt.qt.core/src/org/eclipse')
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/QtInstallManager.java4
1 files changed, 2 insertions, 2 deletions
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 c8cbcd0ac89..b4988a486da 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
@@ -28,7 +28,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.InstanceScope;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
@@ -39,7 +39,7 @@ public class QtInstallManager implements IQtInstallManager {
private List<IQtInstallListener> listeners = new LinkedList<>();
private Preferences getPreferences() {
- return ConfigurationScope.INSTANCE.getNode(Activator.ID).node("qtInstalls"); //$NON-NLS-1$
+ return InstanceScope.INSTANCE.getNode(Activator.ID).node("qtInstalls"); //$NON-NLS-1$
}
private void initInstalls() {

Back to the top