diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-02-16 03:50:59 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-02-16 03:50:59 -0800 |
| commit | b7c25e0c1346256be12310264ea5cc4ce7794118 (patch) | |
| tree | b4e2296d6b0070f20babee838af266850a315681 /src | |
| parent | 999b4cacaf53189dc9e8d5c6373c1f3da5b8ae4c (diff) | |
| parent | 7dcd2004897e025391830b419426cf88491f23b5 (diff) | |
| download | bitcoin-b7c25e0c1346256be12310264ea5cc4ce7794118.tar.xz | |
Merge pull request #843 from TheBlueMatt/qrcodedoc
Fix one compile-time warning and fix libqrcode linking in releases
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.unix | 4 | ||||
| -rw-r--r-- | src/qt/messagepage.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 41452dec81..80b5bca341 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -7,7 +7,7 @@ USE_UPNP:=0 DEFS=-DNOPCH 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 LMODE2 = dynamic @@ -21,7 +21,7 @@ else endif # for boost 1.37, add -mt to the boost libraries -LIBS= \ +LIBS += \ -Wl,-B$(LMODE) \ -l boost_system$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \ diff --git a/src/qt/messagepage.cpp b/src/qt/messagepage.cpp index dee1837ed6..46a0cbae24 100644 --- a/src/qt/messagepage.cpp +++ b/src/qt/messagepage.cpp @@ -1,6 +1,12 @@ #include <string> #include <vector> +#include <QClipboard> +#include <QInputDialog> +#include <QList> +#include <QListWidgetItem> +#include <QMessageBox> + #include "main.h" #include "wallet.h" #include "init.h" @@ -13,12 +19,6 @@ #include "guiutil.h" #include "walletmodel.h" -#include <QClipboard> -#include <QInputDialog> -#include <QList> -#include <QListWidgetItem> -#include <QMessageBox> - MessagePage::MessagePage(QWidget *parent) : QDialog(parent), ui(new Ui::MessagePage) |