aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <[email protected]>2012-07-10 13:44:56 +0200
committerPhilip Kaufmann <[email protected]>2012-07-11 11:18:57 +0200
commit30d509c12e369ddd897fe235413e0c7b4d54cb09 (patch)
treec86db0256ceec52d11e6476053f03205e21761a3
parentMerge pull request #1569 from Diapolo/addressbookpage (diff)
downloaddiscoin-30d509c12e369ddd897fe235413e0c7b4d54cb09.tar.xz
discoin-30d509c12e369ddd897fe235413e0c7b4d54cb09.zip
fix for build.h regeneration failure when compiling on Windows
- as the "||" operator is not known to qmake use "|" instead, which ensures the code in brackets does never get executed on Windows
-rw-r--r--bitcoin-qt.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index ed6ce85aa..f2d9b6f08 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -81,7 +81,7 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
}
# regenerate src/build.h
-!windows || contains(USE_BUILD_INFO, 1) {
+!windows|contains(USE_BUILD_INFO, 1) {
genbuild.depends = FORCE
genbuild.commands = cd $$PWD; /bin/sh share/genbuild.sh $$OUT_PWD/build/build.h
genbuild.target = $$OUT_PWD/build/build.h