Fixes #7189.
build: Remove spurious dollar sign. Fixes #7189. #7604
pull dooglus wants to merge 1 commits into bitcoin:master from dooglus:fix_qt4_failback changing 1 files +1 −1-
dooglus commented at 3:16 AM on February 26, 2016: contributor
-
Remove spurious dollar sign. Fixes #7189. 3d19193f14
-
paveljanik commented at 6:14 AM on February 26, 2016: contributor
ACK
-
paveljanik commented at 6:22 AM on February 26, 2016: contributor
It is there starting from 2014-01-10...
-
jonasschnelli commented at 7:33 AM on February 26, 2016: contributor
Nice catch! utACK.
- jonasschnelli added the label GUI on Feb 26, 2016
-
fanquake commented at 2:45 AM on February 27, 2016: member
-
dooglus commented at 9:31 PM on February 27, 2016: contributor
Here's the limited testing I did, showing that it uses Qt4 if Qt5 isn't available:
$ alias show4='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/QtCore.pc{.hide,}' $ alias hide4='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/QtCore.pc{,.hide}' $ alias show5='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/Qt5Core.pc{.hide,}' $ alias hide5='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/Qt5Core.pc{,.hide}' # before applying the fix $ hide4; hide5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # no QT4 or QT5 checking whether to build Bitcoin Core GUI... no (Qt5) $ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 only checking whether to build Bitcoin Core GUI... no (Qt5) $ hide4; show5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT5 only checking whether to build Bitcoin Core GUI... yes (Qt5) $ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 and QT5 checking whether to build Bitcoin Core GUI... yes (Qt5) # apply the fix and re-run autogen.sh: $ sed -i -e 's/x[$]qt5/xqt5/' build-aux/m4/bitcoin_qt.m4 $ ./autogen.sh > /dev/null 2>&1 # after applying the fix $ hide5; hide4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # no QT4 or QT5 checking whether to build Bitcoin Core GUI... no (Qt5) $ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 only checking whether to build Bitcoin Core GUI... yes (Qt4) # we have QT4 and not QT5. 4 is used $ hide4; show5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT5 only checking whether to build Bitcoin Core GUI... yes (Qt5) $ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 and QT5 checking whether to build Bitcoin Core GUI... yes (Qt5) - laanwj added the label Needs backport on Feb 29, 2016
-
laanwj commented at 8:39 AM on February 29, 2016: member
utACK 3d19193
- laanwj renamed this:
Remove spurious dollar sign. Fixes #7189.
build: Remove spurious dollar sign. Fixes #7189.
on Feb 29, 2016 - laanwj merged this on Feb 29, 2016
- laanwj closed this on Feb 29, 2016
- laanwj referenced this in commit 354b03dee1 on Feb 29, 2016
-
MarcoFalke commented at 11:00 AM on June 9, 2016: member
Backported as part of #7938. Removing label 'Needs backport'.
- MarcoFalke removed the label Needs backport on Jun 9, 2016
- MarcoFalke locked this on Sep 8, 2021
