Merge branch 'master' of github.com:0xDEADFACE/novacoin into DEADFACE

diff --git a/doc/building novacoind and novacoinqt under Windows with MSVC.txt b/doc/building novacoind and novacoinqt under Windows with MSVC.txt
index 6b70099..5c9a1af 100644 (file)
--- a/doc/building novacoind and novacoinqt under Windows with MSVC.txt
+++ b/doc/building novacoind and novacoinqt under Windows with MSVC.txt
@@ -76,7 +76,7 @@ cd C:\MyProjects\Deps\build-helpers
 buildqrcode.bat
 
 2.6 Qt 5
--Скачайте http://download.qt-project.org/official_releases/qt/5.1/5.1.1/single/qt-everywhere-opensource-src-5.3.2.7z
+-Скачайте http://download.qt-project.org/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.7z
 -Распакуйте в C:\MyProjects\Deps
 -Если вам нужна поддержка 64 bit, то переименуйте папку qt-everywhere-opensource-src-5.3.2 в qt-everywhere-opensource-src-5.3.2-64
 (если вам нужна возможность строить и 32 bit и 64 bit бинарники, то у вас должны быть обе папки и qt-everywhere-opensource-src-5.3.2-64 и qt-everywhere-opensource-src-5.3.2 )

diff --git a/doc/building novacoind and novacoinqt under Windows with MinGW.txt b/doc/building novacoind and novacoinqt under Windows with MinGW.txt
index b2fce2a..e3e236a 100644 (file)
--- a/doc/building novacoind and novacoinqt under Windows with MinGW.txt
+++ b/doc/building novacoind and novacoinqt under Windows with MinGW.txt
@@ -108,6 +108,8 @@ mingw32-make -j n , где вместо n количество ядер ваше
 Qt 5:
 -Скачайте http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.7z
 http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qttools-opensource-src-5.3.2.7z
+http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qttranslations-opensource-src-5.3.2.7z
+
 -Распакуйте в C:\Qt
 -Переименуйте папку qtbase-opensource-src-5.3.2 в 5.3.2
 -Откройте командную строку Windows и выполните следующий код:
@@ -127,6 +129,9 @@ cd C:\Qt\qttools-opensource-src-5.3.2
 qmake qttools.pro
 mingw32-make
 
+cd C:\Qt\qttranslations-opensource-src-5.3.2
+qmake qttranslations.pro
+mingw32-make
 
 
 Qt4:
@@ -357,6 +362,8 @@ Qt 5:
 http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qttools-opensource-src-5.3.2.7z
 -Распакуйте в C:\Qt
 -Переименуйте папку qtbase-opensource-src-5.3.2 в 5.3.2-x64
+-Переименуйте папку qttools-opensource-src-5.3.2 в qttools-opensource-src-5.3.2-x64
+-Переименуйте папку qttranslations-opensource-src-5.3.2 в qttranslations-opensource-src-5.3.2-x64
 -Откройте командную строку Windows и выполните следующий код:
 
 set INCLUDE=C:\deps\x64\libpng-1.6.12;C:\deps\x64\openssl-1.0.1j\include
@@ -374,6 +381,10 @@ cd C:\Qt\qttools-opensource-src-5.3.2-x64
 qmake qttools.pro
 mingw32-make
 
+cd C:\Qt\qttranslations-opensource-src-5.3.2-x64
+qmake qttranslations.pro
+mingw32-make
+
 Qt4:
 -Скачайте http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.zip
 -Распакуйте в C:\Qt

diff --git a/src/netbase.cpp b/src/netbase.cpp
index 5516144..f7975f4 100644 (file)
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -13,7 +13,8 @@
 #endif
 
 #ifdef _MSC_VER
-#define ssize_t size_t
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
 #endif
 
 #include "strlcpy.h"

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 45e2c4c..d7bc458 100644 (file)
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -258,7 +258,11 @@ void BitcoinGUI::createActions()
     aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About NovaCoin"), this);
     aboutAction->setToolTip(tr("Show information about NovaCoin"));
     aboutAction->setMenuRole(QAction::AboutRole);
+#if QT_VERSION < 0x050000
     aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
+#else
+    aboutQtAction = new QAction(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
+#endif
     aboutQtAction->setToolTip(tr("Show information about Qt"));
     aboutQtAction->setMenuRole(QAction::AboutQtRole);
     optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);