From 3ebfeed3f8dcab1945bcec1946b26f3dd08d1c71 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 21 Apr 2017 14:31:44 +0000 Subject: [PATCH] defs.mk, qt-defs.mk: Finally made Qt 5 work without project-local definitons Signed-off-by: Jan Lindemann --- make/defs.mk | 1 + make/qt-defs.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index d0287bdc..64071de9 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -628,6 +628,7 @@ ifeq ($(GCC_MAJOR),4) endif ifeq ($(USE_QT),true) + include $(MODDIR)/make/qtversion.mk include $(MODDIR)/make/qt-defs.mk endif diff --git a/make/qt-defs.mk b/make/qt-defs.mk index 418fff41..a8fad1a6 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -145,6 +145,8 @@ ifeq ($(QT_MAJOR_VERSION),4) UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES)) else UIC_H += $(patsubst %.ui,%.h, $(UIFILES)) +LOCAL_CFLAGS += -fPIC +LOCAL_CPPFLAGS += -fPIC endif UIC_CPP += $(patsubst %.ui,uic_%.cpp, $(UIFILES))