diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-22 11:26:48 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-22 11:32:03 +0200 |
| commit | f604bf63211f48396fb6076ba1eec33f27e0b2e3 (patch) | |
| tree | a7424bb4c24a0b1ef104df17426ddf7f60fb8219 | |
| parent | 351abf9e035581e3320fbb72ec5b1fa452b09c2f (diff) | |
| parent | f59dceb44f9bcfe1447b2dcca7483ed806cab22a (diff) | |
Merge #7925: qt: Fix out-of-tree GUI builds
f59dceb qt: Fix out-of-tree GUI builds (Wladimir J. van der Laan)
| -rw-r--r-- | src/Makefile.qt.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 8443fe697b..3b39919441 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -424,11 +424,11 @@ ui_%.h: %.ui $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(UIC) -o $@ $< || (echo "Error creating $@"; false) %.moc: %.cpp - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \ + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(DEFAULT_INCLUDES) $(QT_INCLUDES) $(MOC_DEFS) $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ moc_%.cpp: %.h - $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \ + $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(DEFAULT_INCLUDES) $(QT_INCLUDES) $(MOC_DEFS) $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ %.qm: %.ts |