aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.include
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2013-12-02 16:55:37 -0500
committerCory Fields <cory-nospam-@coryfields.com>2014-01-10 16:30:33 -0500
commit47ffb505331b8f6257a6879b02415e604ad85da0 (patch)
tree277064dc0ae9200a587f856eacd6adf8864d8b7d /src/Makefile.include
parent60dc589477f963d9848be7bb7fb0589a30deb912 (diff)
qt5: Use QT_SELECT for debian-based distros.
At least Debian/Ubuntu use 'qtchooser' for switching between qt4/qt5 binaries. It is a wrapper for all qt tools, and calls the named tool of the default version unless overridden by the -qt= option or QT_SELECT environment variable. QT_SELECT is set by configure once the qt version has been chosen. Take for example, moc. $ which moc /usr/bin/moc $ ls -go /usr/bin/moc lrwxrwxrwx 1 9 Jul 3 21:33 /usr/bin/moc -> qtchooser $ qtchooser -print-env QT_SELECT="default" QTTOOLDIR="/usr/lib/x86_64-linux-gnu/qt4/bin" QTLIBDIR="/usr/lib/x86_64-linux-gnu" $ QT_SELECT=qt5 qtchooser -print-env QT_SELECT="qt5" QTTOOLDIR="/usr/lib/x86_64-linux-gnu/qt5/bin" QTLIBDIR="/usr/lib/x86_64-linux-gnu" $ moc -v Qt Meta Object Compiler version 63 (Qt 4.8.4) $ QT_SELECT=qt5 moc -v Qt Meta Object Compiler version 67 (Qt 5.0.1) This should be harmless elsewhere.
Diffstat (limited to 'src/Makefile.include')
-rw-r--r--src/Makefile.include8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.include b/src/Makefile.include
index 13cffd29bc..b9e6c262ca 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -32,23 +32,23 @@ $(LIBBITCOINQT):
ui_%.h: %.ui
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
- @test -f $(UIC) && $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
+ @test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
$(SED) -i.bak -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak
$(SED) -i.bak -e '/^\*\*.*by:/d' $(abs_builddir)/$@ && rm $(abs_builddir)/$@.bak
%.moc: %.cpp
- $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
+ QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
$(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak
$(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak
moc_%.cpp: %.h
- $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
+ QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
$(SED) -i.bak -e '/^\*\*.*Created:/d' $@ && rm $@.bak
$(SED) -i.bak -e '/^\*\*.*by:/d' $@ && rm $@.bak
%.qm: %.ts
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
- @test -f $(LRELEASE) && $(LRELEASE) $(abs_srcdir)/$< -qm $(abs_builddir)/$@ || \
+ @test -f $(LRELEASE) && QT_SELECT=$(QT_SELECT) $(LRELEASE) $(abs_srcdir)/$< -qm $(abs_builddir)/$@ || \
echo error: could not build $(abs_builddir)/$@
%.pb.cc %.pb.h: %.proto