diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:49 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-09 23:17:49 +0000 |
| commit | 32419357747f9c13c9d934d50f7974387419c0ce (patch) | |
| tree | 53785410b9b4329f1243c2927b175920366442ce /doc | |
| parent | 3d6adbe71a5504d77e78a8ffad5f91d11a32c065 (diff) | |
| parent | 4cf9b4c6fad8e2ead715c5fbbfb023e05826a94d (diff) | |
| download | bitcoin-32419357747f9c13c9d934d50f7974387419c0ce.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/readme-qt.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/readme-qt.rst b/doc/readme-qt.rst index f55b9e7bd2..866b147c56 100644 --- a/doc/readme-qt.rst +++ b/doc/readme-qt.rst @@ -40,7 +40,7 @@ Windows build instructions: - Open the bitcoin-qt.pro file in Qt Creator and build as normal (ctrl-B) -.. _`Qt Windows SDK`: http://qt.nokia.com/downloads/sdk-windows-cpp +.. _`Qt Windows SDK`: http://qt-project.org/downloads/ .. _`dependencies archive`: https://download.visucore.com/bitcoin/qtgui_deps_1.zip .. [#] PGP signature: https://download.visucore.com/bitcoin/qtgui_deps_1.zip.sig (signed with RSA key ID `610945D0`_) .. _`610945D0`: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x610945D0 @@ -62,7 +62,7 @@ Mac OS X - Open the bitcoin-qt.pro file in Qt Creator and build as normal (cmd-B) -.. _`Qt Mac OS X SDK`: http://qt.nokia.com/downloads/sdk-mac-os-cpp +.. _`Qt Mac OS X SDK`: http://qt-project.org/downloads/ .. _`MacPorts`: http://www.macports.org/install.php @@ -106,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: +--------------+--------------------------------------------------------------------------+ |