Merge pull request #843 from TheBlueMatt/qrcodedoc

Fix one compile-time warning and fix libqrcode linking in releases

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) \

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)