mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-04 23:55:26 +02:00
Code Issues Wiki Activity

Bug 433869: IQMakeProjectInfo is not updating on active conf. changed

Browse source 
Fixing incorrect eventTypes used for registering
CProjectDescriptionListener in QMakeProjectInfo.start() method.

Change-Id: Ieb602a38999868e3da8487a1757c69bd50cb5837
Signed-off-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-on: https://git.eclipse.org/r/26264
Tested-by: Hudson CI
Reviewed-by: Elena Laskavaia <elaskavaia.cdt@gmail.com>
This commit is contained in:
David Kaspar 2014-04-30 18:20:20 +02:00 • committed by Elena Laskavaia
parent 62369d66e9
commit db2f21e5f2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/index/QMakeProjectInfoManager.java
View file

@ -46,7 +46,7 @@ public class QMakeProjectInfoManager {
synchronized (CACHE_SYNC) { synchronized (CACHE_SYNC) {
CACHE = new HashMap<IProject,QMakeProjectInfo>(); CACHE = new HashMap<IProject,QMakeProjectInfo>();
} }
CoreModel.getDefault().addCProjectDescriptionListener(PD_LISTENER, ICDescriptionDelta.ACTIVE_CFG); CoreModel.getDefault().addCProjectDescriptionListener(PD_LISTENER, CProjectDescriptionEvent.LOADED | CProjectDescriptionEvent.APPLIED);
ResourcesPlugin.getWorkspace().addResourceChangeListener(RC_LISTENER, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE); ResourcesPlugin.getWorkspace().addResourceChangeListener(RC_LISTENER, IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE);
} }
@ -110,9 +110,14 @@ public class QMakeProjectInfoManager {
// called on active project configuration change // called on active project configuration change
@Override @Override
public void handleEvent(CProjectDescriptionEvent event) { public void handleEvent(CProjectDescriptionEvent event) {
QMakeProjectInfo info = getQMakeProjectInfoFor(event.getProject(), false); ICDescriptionDelta projectDelta = event.getProjectDelta();
if (info != null) { if (projectDelta != null) {
info.updateState(); if ((projectDelta.getChangeFlags() & ICDescriptionDelta.ACTIVE_CFG) != 0) {
QMakeProjectInfo info = getQMakeProjectInfoFor(event.getProject(), false);
if (info != null) {
info.updateState();
}
}
} }
} }