From 6e1a9b1f227e15ab224a6e66eee43334bd32963a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 6 Sep 2016 19:53:44 +0000
Subject: [PATCH] qt-defs.mk, qt-rules.mk: Several fixes and additions to
 qt-rules.mk and qt-defs.mk

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/qt-defs.mk  | 12 +++++++-----
 make/qt-rules.mk |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/make/qt-defs.mk b/make/qt-defs.mk
index f71d39b0..bfa9feaf 100644
--- a/make/qt-defs.mk
+++ b/make/qt-defs.mk
@@ -86,6 +86,8 @@ QT_MODULES = \
 	Qt5Svg  \
 	Qt5Test  \
 	Qt5UiTools  \
+	Qt5WebEngine  \
+	Qt5WebEngineWidgets  \
 	Qt5WebKit  \
 	Qt5WebKitWidgets  \
 	Qt5Widgets  \
@@ -119,9 +121,9 @@ QT_MODULES = \
 endif
 
 QT_BIN_PREFIX         ?= $(shell pkg-config --variable=host_bins $(QT_MODULES))
-MOC                   ?= $(QT_BIN_PREFIX)/bin/moc
-UIC                   ?= $(QT_BIN_PREFIX)/bin/uic
-RCC                   ?= $(QT_BIN_PREFIX)/bin/rcc
+MOC                   ?= $(QT_BIN_PREFIX)/moc
+UIC                   ?= $(QT_BIN_PREFIX)/uic
+RCC                   ?= $(QT_BIN_PREFIX)/rcc
 LPPFLAGS              += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
 INCLUDE               += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
 CPPFLAGS              += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
@@ -132,11 +134,11 @@ UIFILES               += $(wildcard *.ui)
 RCCFILES              += $(wildcard *.qrc)
 
 ifneq ($(wildcard *.h),)
-MOC_H_HC              += $(shell grep -H Q_OBJECT $(wildcard *.h) | cut -d: -f1 | sort -u)
+MOC_H_HC              += $(shell grep -l Q_OBJECT $(wildcard *.h))
 endif
 MOC_H_UI              += $(patsubst %.ui,ui_%.h,$(UIFILES))
 MOC_H                 += $(sort $(MOC_H_HC) $(MOC_H_UI))
-MOC_CPP               += $(patsubst %.h,moc_%.cpp,$(MOC_H_HC))
+MOC_CPP               += $(patsubst %.h,moc_%.cpp,$(notdir $(MOC_H_HC)))
 #	$(patsubst %.ui,moc_%.cpp,$(UIFILES)) \
 RCC_CPP               += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES))
 ifeq ($(QT_MAJOR_VERSION),4)
diff --git a/make/qt-rules.mk b/make/qt-rules.mk
index 4da49625..444d5f4d 100644
--- a/make/qt-rules.mk
+++ b/make/qt-rules.mk
@@ -4,6 +4,8 @@ moc_%.cpp: %.h
 else
 moc_%.cpp: %.h
 	$(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $<
+moc_%.cpp: include/%.h
+	$(MOC) $(filter -D% -I%,$(strip $(BUILD_CPPFLAGS))) -o $@ $<
 endif
 
 rcc_%.cpp: %.qrc