Merge branch 'master' of https://github.com/laanwj/bitcoin-qt

diff --combined bitcoin-qt.pro
index e1b8551,cdff04b..dd7a399
--- 1/bitcoin-qt.pro
--- 2/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@@ -17,7 -17,7 +17,7 @@@ QMAKE_CXXFLAGS += -fstack-protecto
  QMAKE_LFLAGS += -fstack-protector
  
  # disable quite some warnings because bitcoin core "sins" a lot
 -QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts  -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch
 +QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts  -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch -Wno-uninitialized
  
  # Input
  DEPENDPATH += src/qt src src/cryptopp src json/include
@@@ -84,7 -84,9 +84,9 @@@ HEADERS += src/qt/bitcoingui.h 
      src/qt/overviewpage.h \
      src/qt/csvmodelwriter.h \
      src/qt/qtwin.h \
-     src/crypter.h
+     src/crypter.h \
+     src/qt/sendcoinsentry.h \
+     src/qt/qvalidatedlineedit.h
  SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
      src/qt/transactiontablemodel.cpp \
      src/qt/addresstablemodel.cpp \
@@@ -124,7 -126,9 +126,9 @@@
      src/qt/overviewpage.cpp \
      src/qt/csvmodelwriter.cpp \
      src/qt/qtwin.cpp \
-     src/crypter.cpp
+     src/crypter.cpp \
+     src/qt/sendcoinsentry.cpp \
+     src/qt/qvalidatedlineedit.cpp
  
  RESOURCES += \
      src/qt/bitcoin.qrc
@@@ -135,7 -139,8 +139,8 @@@ FORMS += 
      src/qt/forms/aboutdialog.ui \
      src/qt/forms/editaddressdialog.ui \
      src/qt/forms/transactiondescdialog.ui \
-     src/qt/forms/overviewpage.ui
+     src/qt/forms/overviewpage.ui \
+     src/qt/forms/sendcoinsentry.ui
  
  CODECFORTR = UTF-8
  TRANSLATIONS = src/qt/locale/bitcoin_nl.ts src/qt/locale/bitcoin_de.ts