Merging from the BR_V5_DEV branch.

diff --git a/src/Event/Event.pro b/src/Event/Event.pro
index b28d7bdca55129d1eb621cfc10c6750382d20f88..5aaa9a806243c355937e2fdce8ab9f86bc38f732 100644 (file)
--- a/src/Event/Event.pro
+++ b/src/Event/Event.pro
@@ -1,8 +1,8 @@
 TEMPLATE = lib
 TARGET = Event
-DESTDIR = ../../lib
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH += ../../include
 LIBS +=