Browse Source

Merge pull request #843 from TheBlueMatt/qrcodedoc

Fix one compile-time warning and fix libqrcode linking in releases
0.8
Pieter Wuille 13 years ago
parent
commit
b7c25e0c13
  1. 16
      bitcoin-qt.pro
  2. 3
      contrib/debian/control
  3. 2
      contrib/debian/rules
  4. 2
      contrib/gitian-descriptors/deps-win32.yml
  5. 10
      contrib/gitian-descriptors/gitian.yml
  6. 4
      src/makefile.unix
  7. 12
      src/qt/messagepage.cpp

16
bitcoin-qt.pro

@ -19,14 +19,6 @@ OBJECTS_DIR = build
MOC_DIR = build MOC_DIR = build
UI_DIR = build UI_DIR = build
# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
contains(USE_QRCODE, 1) {
message(Building with QRCode support)
DEFINES += USE_QRCODE
LIBS += -lqrencode
}
# use: qmake "RELEASE=1" # use: qmake "RELEASE=1"
contains(RELEASE, 1) { contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.5, 32-bit) # Mac: compile for maximum compatibility (10.5, 32-bit)
@ -38,6 +30,14 @@ contains(RELEASE, 1) {
} }
} }
# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
contains(USE_QRCODE, 1) {
message(Building with QRCode support)
DEFINES += USE_QRCODE
LIBS += -lqrencode
}
# use: qmake "USE_UPNP=1" ( enabled by default; default) # use: qmake "USE_UPNP=1" ( enabled by default; default)
# or: qmake "USE_UPNP=0" (disabled by default) # or: qmake "USE_UPNP=0" (disabled by default)
# or: qmake "USE_UPNP=-" (not supported) # or: qmake "USE_UPNP=-" (not supported)

3
contrib/debian/control vendored

@ -15,7 +15,8 @@ Build-Depends: debhelper,
libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev, libboost-thread-dev (>> 1.35) | libboost-thread1.35-dev,
libboost-test-dev (>> 1.35) | libboost-test1.35-dev, libboost-test-dev (>> 1.35) | libboost-test1.35-dev,
qt4-qmake, qt4-qmake,
libqt4-dev libqt4-dev,
libqrencode-dev
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Homepage: http://www.bitcoin.org/ Homepage: http://www.bitcoin.org/
Vcs-Git: git://github.com/bitcoin/bitcoin.git Vcs-Git: git://github.com/bitcoin/bitcoin.git

2
contrib/debian/rules vendored

@ -20,7 +20,7 @@ override_dh_auto_clean:
cd src; $(MAKE) -f makefile.unix clean cd src; $(MAKE) -f makefile.unix clean
override_dh_auto_configure: override_dh_auto_configure:
qmake bitcoin-qt.pro qmake bitcoin-qt.pro USE_SSL=1 USE_QRCODE=1
override_dh_auto_test: override_dh_auto_test:
cd src; $(MAKE) -f makefile.unix test_bitcoin cd src; $(MAKE) -f makefile.unix test_bitcoin

2
contrib/gitian-descriptors/deps-win32.yml

@ -59,5 +59,3 @@ script: |
cd .. cd ..
# #
tar cjvpf "$OUTDIR/bitcoin-deps-0.0.1.tbz2" "$HOME/build" tar cjvpf "$OUTDIR/bitcoin-deps-0.0.1.tbz2" "$HOME/build"

10
contrib/gitian-descriptors/gitian.yml

@ -16,13 +16,15 @@ packages:
- "libssl-dev" - "libssl-dev"
- "git-core" - "git-core"
- "unzip" - "unzip"
- "libqrencode-dev" - "pkg-config"
- "libpng12-dev"
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: remotes:
- "url": "https://github.com/bitcoin/bitcoin.git" - "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin" "dir": "bitcoin"
files: files:
- "miniupnpc-1.6.tar.gz" - "miniupnpc-1.6.tar.gz"
- "qrencode-3.2.0.tar.bz2"
script: | script: |
INSTDIR="$HOME/install" INSTDIR="$HOME/install"
export LIBRARY_PATH="$INSTDIR/lib" export LIBRARY_PATH="$INSTDIR/lib"
@ -32,6 +34,12 @@ script: |
INSTALLPREFIX=$INSTDIR make $MAKEOPTS install INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
cd .. cd ..
# #
tar xjf qrencode-3.2.0.tar.bz2
cd qrencode-3.2.0
./configure --prefix=$INSTDIR --enable-static --disable-shared
make $MAKEOPTS install
cd ..
#
cd bitcoin cd bitcoin
mkdir -p $OUTDIR/src mkdir -p $OUTDIR/src
cp -a . $OUTDIR/src cp -a . $OUTDIR/src

4
src/makefile.unix

@ -7,7 +7,7 @@ USE_UPNP:=0
DEFS=-DNOPCH DEFS=-DNOPCH
DEFS += $(addprefix -I,$(CURDIR) $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) DEFS += $(addprefix -I,$(CURDIR) $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
LIBS += $(addprefix -l,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
LMODE = dynamic LMODE = dynamic
LMODE2 = dynamic LMODE2 = dynamic
@ -21,7 +21,7 @@ else
endif endif
# for boost 1.37, add -mt to the boost libraries # for boost 1.37, add -mt to the boost libraries
LIBS= \ LIBS += \
-Wl,-B$(LMODE) \ -Wl,-B$(LMODE) \
-l boost_system$(BOOST_LIB_SUFFIX) \ -l boost_system$(BOOST_LIB_SUFFIX) \
-l boost_filesystem$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \

12
src/qt/messagepage.cpp

@ -1,6 +1,12 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <QClipboard>
#include <QInputDialog>
#include <QList>
#include <QListWidgetItem>
#include <QMessageBox>
#include "main.h" #include "main.h"
#include "wallet.h" #include "wallet.h"
#include "init.h" #include "init.h"
@ -13,12 +19,6 @@
#include "guiutil.h" #include "guiutil.h"
#include "walletmodel.h" #include "walletmodel.h"
#include <QClipboard>
#include <QInputDialog>
#include <QList>
#include <QListWidgetItem>
#include <QMessageBox>
MessagePage::MessagePage(QWidget *parent) : MessagePage::MessagePage(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::MessagePage) ui(new Ui::MessagePage)

Loading…
Cancel
Save