Merge branch 'master' of github.com:novacoin-project/novacoin

diff --git a/mingw64_deps/README.md b/mingw64_deps/README.md
index b5b313b..08f9eec 100644 (file)
--- a/mingw64_deps/README.md
+++ b/mingw64_deps/README.md
@@ -11,7 +11,7 @@ You will also need to install CMake 3.20 or newer to compile Qt libraries. Simpl
     sudo apt install python3-pip
     pip3 install cmake
 
-Unpack compiler binaries to suitable directory and ensure that /bin directory is mentioned in your PATH. You will also need to add /home/user/.local/bin to PATH as well.
+Unpack compiler binaries to suitable directory (/opt is preferred) and ensure that its /bin subdirectory is mentioned in your PATH. You will also need to add /home/user/.local/bin to PATH as well.
 
 ## Setting up
 

diff --git a/mingw64_deps/qt/build.sh b/mingw64_deps/qt/build.sh
index 6ea0cd5..6e21d9e 100755 (executable)
--- a/mingw64_deps/qt/build.sh
+++ b/mingw64_deps/qt/build.sh
@@ -13,6 +13,7 @@ fi
 mkdir ${ROOT}/${CROSS}-w64-mingw32-build
 mkdir ${ROOT}/${CROSS}-w64-mingw32-build-qttools
 mkdir ${ROOT}/${CROSS}-w64-mingw32-build-qttranslations
+mkdir ${ROOT}/${CROSS}-w64-mingw32-build-qtdeclarative
 
 # Stage directory
 mkdir ${ROOT}/${CROSS}-w64-mingw32
@@ -33,11 +34,18 @@ make DESTDIR=${ROOT}/${CROSS}-w64-mingw32 install
 
 # Compile translations
 
-cd cd ${ROOT}/${CROSS}-w64-mingw32-build-qttranslations
+cd ${ROOT}/${CROSS}-w64-mingw32-build-qttranslations
 ${ROOT}/${CROSS}-w64-mingw32/bin/qmake ${ROOT}/qttranslations
 make -j 4
 make DESTDIR=${ROOT}/${CROSS}-w64-mingw32 install
 
+# Compile qtdeclarative
+
+cd ${ROOT}/${CROSS}-w64-mingw32-build-qtdeclarative
+${ROOT}/${CROSS}-w64-mingw32/bin/qmake ${ROOT}/qtdeclarative
+make -j 4
+make DESTDIR=${ROOT}/${CROSS}-w64-mingw32 install
+
 # Remove build directories
 cd ${ROOT}
-rm -rf ${ROOT}/${CROSS}-w64-mingw32-build ${ROOT}/${CROSS}-w64-mingw32-build-qttools ${ROOT}/${CROSS}-w64-mingw32-build-qttranslations
+rm -rf ${ROOT}/${CROSS}-w64-mingw32-build ${ROOT}/${CROSS}-w64-mingw32-build-qttools ${ROOT}/${CROSS}-w64-mingw32-build-qttranslations ${ROOT}/${CROSS}-w64-mingw32-build-qtdeclarative