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

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 6b1fb7f..1f65d05 100644 (file)
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -16,10 +16,17 @@ OBJECTS_DIR = build
 MOC_DIR = build
 UI_DIR = build
 
-# use: qmake "USE_UPNP=0" (disable by default) or "USE_UPNP=1" (enable by default)
-# miniupnpc (http://miniupnp.free.fr/files/) must be installed
-count(USE_UPNP, 1) {
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
     message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
     DEFINES += USE_UPNP=$$USE_UPNP
     LIBS += -lminiupnpc
 }
@@ -32,7 +39,7 @@ contains(USE_DBUS, 1) {
 }
 
 # use: qmake "USE_SSL=1"
-contains(USE_DBUS, 1) {
+contains(USE_SSL, 1) {
     message(Building with SSL support for RPC)
     DEFINES += USE_SSL
 }

diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst
index b12aa30..b7f0d2c 100644 (file)
--- a/doc/readme-qt.rst
+++ b/doc/readme-qt.rst
@@ -119,13 +119,13 @@ http://miniupnp.tuxfamily.org/files/.  UPnP support is not compiled in by defaul
 
 Set USE_UPNP to a different value to control this:
 
-+------------+--------------------------------------------------------------+
-| USE_UPNP=  | (the default) no UPnP support, miniupnpc not required;       |
-+------------+--------------------------------------------------------------+
-| USE_UPNP=0 | UPnP support turned off by default at runtime;               |
-+------------+--------------------------------------------------------------+
-| USE_UPNP=1 | UPnP support turned on by default at runtime.                |
-+------------+--------------------------------------------------------------+
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=- | no UPnP support, miniupnpc not required;                                 |
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=0 | (the default) built with UPnP, support turned off by default at runtime; |
++------------+--------------------------------------------------------------------------+
+| USE_UPNP=1 | build with UPnP support turned on by default at runtime.                 |
++------------+--------------------------------------------------------------------------+
 
 Mac OS X users: miniupnpc is currently outdated on MacPorts. An updated Portfile is provided in contrib/miniupnpc within this project.
 You can execute the following commands in a terminal to install it:

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 60a9074..91881c3 100644 (file)
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -121,7 +121,8 @@ int main(int argc, char *argv[])
     QString locale = QLocale::system().name();
     QTranslator translator;
     translator.load(":/translations/"+locale);
-    app.installTranslator(&translator);
+    if (!translator.isEmpty())
+        app.installTranslator(&translator);
 
     QSplashScreen splash(QPixmap(":/images/splash"), 0);
     splash.show();