Merge branch 'master' into aphrodite

rynomster · rynomster · commit 27ce3db00828 · 2016-10-28T08:24:52.000+02:00
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
@@ -23,7 +23,13 @@ then execute the following:
 
 Alternatively, install Qt Creator and open the `shadow.pro` file.
 
-An executable named `shadow` will be built.
+An executable named `umbra` will be built.
+
+You can install the binary with:
+
+::
+
+   make install
 
 
 Windows
@@ -100,8 +106,8 @@ FreeDesktop notification interface through DBUS using the following qmake option
 Generation of QR codes
 -----------------------
 
-libqrencode may be used to generate QRCode images for payment requests. 
-It can be downloaded from http://fukuchi.org/works/qrencode/index.html.en, or installed via your package manager. Pass the USE_QRCODE 
+libqrencode may be used to generate QRCode images for payment requests.
+It can be downloaded from http://fukuchi.org/works/qrencode/index.html.en, or installed via your package manager. Pass the USE_QRCODE
 flag to qmake to control this:
 
 +--------------+--------------------------------------------------------------------------+
diff --git a/shadow.pro b/shadow.pro
@@ -6,6 +6,9 @@ DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd
 CONFIG += thread
 
+target.path = /usr/local/bin/
+INSTALLS += target
+
 # Mobile devices
 android:ios{
     CONFIG += mobility
@@ -369,7 +372,7 @@ SOURCES += \
     src/qt/shadowgui.cpp \
     src/qt/shadow.cpp \
     src/qt/shadowbridge.cpp
-    
+
 
 FORMS += \
     src/qt/forms/coincontroldialog.ui \
