Merge pull request #250 from FeatherCoin/0.9.6.2

0.9.6.2
FeatherCoin · Nov 20, 2017 · 1dc5716 · 1dc5716
2 parents 03b1e1f + 33f277b
commit 1dc5716
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -573,8 +573,6 @@ fi
 
 BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
 
-AC_CHECK_HEADER([qrencode.h],, [AC_MSG_ERROR(qrencode headerfiles not found)])
-AC_CHECK_HEADER([zxing/ZXing.h],, [AC_MSG_ERROR(zxing header files not found)])
 
 AC_MSG_CHECKING([whether to build feathercoind])
 AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_feathercoind = xyes])

diff --git a/src/qt/snapwidget.cpp b/src/qt/snapwidget.cpp
@@ -41,6 +41,7 @@ SnapWidget::~SnapWidget()
 
 void SnapWidget::on_snapButton_clicked() 
 {
+#ifdef USE_QRENCODE
     int _x, _y, _w, _h;
     _x = geometry().x();
     _y = geometry().y() + cancelButton->height();
@@ -77,6 +78,7 @@ void SnapWidget::on_snapButton_clicked()
         decodedString = QString(r->getText()->getText().c_str());
         delete qrDecoder;
     }
+#endif
     this->close();
 }