--- a/Makefile.gen	Tue Oct 16 01:49:15 2012 +0300
+++ b/Makefile.gen	Tue Oct 16 19:06:51 2012 +0300
@@ -21,7 +21,9 @@
 endif
 endif
 
-EDITOR_OBJS = gtktimeline.o gtkwaveform.o dmeditor.o
+EDITOR_MAKEFILE = Makefile.editor
+EDITOR_SOURCES = edmain.cpp edgui.cpp edtimeline.cpp edwaveform.cpp
+EDITOR_HEADERS = edmain.h edtimeline.h edwaveform.h
 
 
 ###
@@ -366,19 +368,21 @@
 ###
 ### Editor targets
 ###
-$(OBJPATH)dmeditor.o: $(DMLIB)dmeditor.c
-	@echo " CC $+"
-	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS)
-
-
-$(BINPATH)ed_$(DEMO_BIN)$(EXEEXT): $(OBJPATH)$(DEMO_BIN).o $(addprefix $(OBJPATH),$(EDITOR_OBJS)) $(addprefix $(OBJPATH),$(filter-out dmsimple.o,$(DEMO_OBJS))) $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(GTK_LDFLAGS)
+$(BINPATH)ed_$(DEMO_BIN)$(EXEEXT): $(DMLIB)editor.pro $(addprefix $(DMLIB),$(EDITOR_SOURCES)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
+	@echo " QMAKE $+"
+	qmake -Wall MAKEFILE="$(EDITOR_MAKEFILE)" \
+		POST_TARGETDEPS="$(filter %.o %.a,$+)" \
+		QMAKE_CXXFLAGS="$(DM_CFLAGS) $(SDL_CFLAGS)" \
+		QMAKE_LIBS="$(DM_LDFLAGS) $(SDL_LDFLAGS)"
+		SOURCES="$(EDITOR_SOURCES)" \
+		HEADERS="$(EDITOR_HEADERS)" $<
+	make -f $(EDITOR_MAKEFILE)
 
 
 ###
 ### Special targets
 ###
 clean:
-	$(RM) $(TARGETS) $(OBJPATH)*.o
+	$(RM) $(TARGETS) $(OBJPATH)*.o $(EDITOR_MAKEFILE)
 
+