bitcoin_qt.m4: Minor fixes and clean-ups. #11711
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use '<QtCore/qconfig.h> and '<QtCore/qglobal.h>' for testing QT_VERSION. This makes the tests work with both Qt4 and Qt5, even if '-fPIC' or '-fPIE' is not used (the compiler might choke otherwise if QT_REDUCE_RELOCATIONS is active).
Add double qoutes to string tests where arguments could (theoretically) contain spaces. Remove double quotes where not necessary. -BEGIN VERIFY SCRIPT- sed -iE -e 's/"x\(yes\|no\|auto\)\?"/x\1/g' -e 's/test \(x\$[^ ]*\)/test "\1"/g' build-aux/m4/bitcoin_qt.m4 -END VERIFY SCRIPT-
fanquake
commented
Nov 17, 2017
| [bitcoin_cv_static_qt=no]) | ||
| ]) | ||
| if test xbitcoin_cv_static_qt = xyes; then | ||
| if test "x$bitcoin_cv_static_qt" = xyes; then |
Member
Author
There was a problem hiding this comment.
Did you still want to delete this test @theuni ?
laanwj
added a commit
that referenced
this pull request
Jan 29, 2018
06abcbf scripted-diff: Orthogonalize string quoting (Werner Lemberg) e0496d3 bitcoin_qt.m4: Add missing dollar sign for variable. (Werner Lemberg) 079f4b2 bitcoin_qt.m4: Add missing braces around variables in autoconf messages. (Werner Lemberg) 8695315 bitcoin_qt.m4: Use correct M4 quoting characters. (Werner Lemberg) db32a4f bitcoin_qt.m4: Improve QT_VERSION tests. (Werner Lemberg) Pull request description: Replaces #11222. Dropped the last commit, and converted e90d91c (now 06abcbf) into a scripted-diff using @theuni's suggestion. Tree-SHA512: f2e1713bda96e8875be08839af914b24b3240f2eecf18cb268f83c82d965ebf544a0022af4f6f73b88b637a4fdd404a96b9fcf8e5bdd11c507b5bb425eeb7e1d
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jan 31, 2020
06abcbf scripted-diff: Orthogonalize string quoting (Werner Lemberg) e0496d3 bitcoin_qt.m4: Add missing dollar sign for variable. (Werner Lemberg) 079f4b2 bitcoin_qt.m4: Add missing braces around variables in autoconf messages. (Werner Lemberg) 8695315 bitcoin_qt.m4: Use correct M4 quoting characters. (Werner Lemberg) db32a4f bitcoin_qt.m4: Improve QT_VERSION tests. (Werner Lemberg) Pull request description: Replaces bitcoin#11222. Dropped the last commit, and converted e90d91c (now 06abcbf) into a scripted-diff using @theuni's suggestion. Tree-SHA512: f2e1713bda96e8875be08839af914b24b3240f2eecf18cb268f83c82d965ebf544a0022af4f6f73b88b637a4fdd404a96b9fcf8e5bdd11c507b5bb425eeb7e1d
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #11222.
Dropped the last commit, and converted e90d91c (now 06abcbf) into a scripted-diff using @theuni's suggestion.