aboutsummaryrefslogtreecommitdiff
path: root/bitcoin-qt.pro
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-28 21:52:32 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-28 21:52:32 +0200
commit002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0 (patch)
tree58a16a226571a80537bfa7e3b1147aa4d0ee8767 /bitcoin-qt.pro
parenta8b95ce6ed5e84d34748ecdd0ff1db4d03377cf0 (diff)
parent4dcad1d294e264a81280fd007d1508d9bd4f0273 (diff)
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts: .gitignore (used upstream version) bitcoin-qt.pro
Diffstat (limited to 'bitcoin-qt.pro')
-rw-r--r--bitcoin-qt.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index eefef5a182..290d5d9dfb 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -12,6 +12,10 @@ CONFIG += no_include_pwd
# BOOST_LIB_PATH, BDB_INCLUDE_PATH, BDB_LIB_PATH
# OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
# use: qmake "USE_UPNP=1"
# miniupnpc (http://miniupnp.free.fr/files/) must be installed
count(USE_UPNP, 1) {