Merge branch 'master' into kdenlivetitle

diff --combined src/modules/qimage/Makefile
index d2d7dd8a343894c1b443da9716c1c5d0f8a4a0f5,0a1d52404258dad75b97b9686582b2fd70efa59a..9424db531a82113ca5af317e78b9e218e5a3c1a2
--- 1/src/modules/qimage/Makefile
--- 2/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@@ -1,15 -1,17 +1,17 @@@
+ CFLAGS += -I../..
+ 
+ LDFLAGS += -L../../framework -lmlt -lpthread -lm
+ 
  include ../../../config.mak
  include config.mak
  
  TARGET = ../libmltqimage$(LIBSUF)
  
 -OBJS = factory.o producer_qimage.o
 -CPPOBJS = qimage_wrapper.o
 +OBJS = factory.o producer_qimage.o producer_kdenlivetitle.o
 +CPPOBJS = qimage_wrapper.o kdenlivetitle_wrapper.o
  
- CFLAGS += -I../..
  CXXFLAGS += $(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
  
- LDFLAGS += -L../../framework -lmlt -lpthread -lm
  LDFLAGS += $(QTLIBS)
  LDFLAGS += -lstdc++