diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-22 09:21:09 +0200 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-08 06:29:27 -0700 |
| commit | 932aedd99a35809620f128d79f63a23ba49ceefd (patch) | |
| tree | 0150a1a2c15db1dc4f2d717295573b34dba7663d /src/Makefile.qt.include | |
| parent | 03c709b42231b1e45603e15c3dfc1ed7e8ecce71 (diff) | |
| download | bitcoin-932aedd99a35809620f128d79f63a23ba49ceefd.tar.xz | |
Cherry-pick of f59dceb (#7925) to 0.12.
=====
qt: Fix out-of-tree GUI builds
Without this patch:
- When I compile the GUI from the bitcoin directory itself, it works as
expected.
- When I build the GUI in an out-of-tree build, I cannot get it to
select tabs. When I click, say the "Receive" tab nothing happens,
the button selects but it doesn't switch the page. The rest - even
the debug window - seems to work.
See full discussion here:
https://github.com/bitcoin/bitcoin/pull/7911#issuecomment-212413442
This turned out to be caused by a mismatch in the arguments to moc,
preventing it from finding `bitcoin-config.h`. Fix this by passing
`$(DEFAULT_INCLUDES)` to it, which gets set to the appropriate
path by autoconf itself.
Diffstat (limited to 'src/Makefile.qt.include')
| -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 9b7085be33..f42f531af4 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -426,11 +426,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 |