QT Win/Mac Fix

.gitignore

@@ -1,8 +1,14 @@
+Denarius
 src/*.exe
 src/denarius
 src/denariusd
 src/test_denarius
 src/build.h
+object_script.Denarius.Release
+object_script.Denarius.Debug
+release
+debug
+src/qt/locale/*.qm
 .*.swp
 *.*~*
 *.bak

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Denarius
-# Generated by qmake (2.01a) (Qt 4.8.7) on: Sun Aug 20 18:18:54 2017
+# Generated by qmake (2.01a) (Qt 4.8.7) on: Sun Aug 20 19:11:45 2017
 # Project:  denarius-qt.pro
 # Template: app
 # Command: /usr/lib/x86_64-linux-gnu/qt4/bin/qmake -o Makefile denarius-qt.pro
@@ -1100,6 +1100,7 @@ build/overviewpage.moc: src/qt/overviewpage.h \
 
 build/rpcconsole.moc: src/qt/rpcconsole.h \
 		build/ui_rpcconsole.h \
+		src/qt/trafficgraphwidget.h \
 		src/qt/clientmodel.h \
 		src/bitcoinrpc.h \
 		src/json/json_spirit_reader_template.h \
@@ -1486,6 +1487,9 @@ build/addresstablemodel.o: src/qt/addresstablemodel.cpp src/qt/addresstablemodel
 
 build/optionsdialog.o: src/qt/optionsdialog.cpp src/qt/optionsdialog.h \
 		build/ui_optionsdialog.h \
+		src/qt/bitcoinamountfield.h \
+		src/qt/qvalidatedlineedit.h \
+		src/qt/qvaluecombobox.h \
 		src/qt/bitcoinunits.h \
 		src/qt/monitoreddatamapper.h \
 		src/netbase.h \
@@ -1548,6 +1552,7 @@ build/sendcoinsdialog.o: src/qt/sendcoinsdialog.cpp src/qt/sendcoinsdialog.h \
 
 build/coincontroldialog.o: src/qt/coincontroldialog.cpp src/qt/coincontroldialog.h \
 		build/ui_coincontroldialog.h \
+		src/qt/coincontroltreewidget.h \
 		src/init.h \
 		src/wallet.h \
 		src/main.h \
@@ -1607,6 +1612,7 @@ build/addressbookpage.o: src/qt/addressbookpage.cpp src/qt/addressbookpage.h \
 
 build/signverifymessagedialog.o: src/qt/signverifymessagedialog.cpp src/qt/signverifymessagedialog.h \
 		build/ui_signverifymessagedialog.h \
+		src/qt/qvalidatedlineedit.h \
 		src/qt/addressbookpage.h \
 		src/base58.h \
 		src/bignum.h \
@@ -3009,6 +3015,8 @@ build/crypter.o: src/crypter.cpp src/crypter.h \
 
 build/sendcoinsentry.o: src/qt/sendcoinsentry.cpp src/qt/sendcoinsentry.h \
 		build/ui_sendcoinsentry.h \
+		src/qt/bitcoinamountfield.h \
+		src/qt/qvalidatedlineedit.h \
 		src/qt/guiutil.h \
 		src/qt/bitcoinunits.h \
 		src/qt/addressbookpage.h \
@@ -3073,6 +3081,7 @@ build/qtipcserver.o: src/qt/qtipcserver.cpp src/qt/qtipcserver.h \
 
 build/rpcconsole.o: src/qt/rpcconsole.cpp src/qt/rpcconsole.h \
 		build/ui_rpcconsole.h \
+		src/qt/trafficgraphwidget.h \
 		src/qt/clientmodel.h \
 		src/bitcoinrpc.h \
 		src/json/json_spirit_reader_template.h \
@@ -3197,6 +3206,7 @@ build/messagemodel.o: src/qt/messagemodel.cpp src/qt/guiutil.h \
 
 build/sendmessagesdialog.o: src/qt/sendmessagesdialog.cpp src/qt/sendmessagesdialog.h \
 		build/ui_sendmessagesdialog.h \
+		src/qt/qvalidatedlineedit.h \
 		src/qt/walletmodel.h \
 		src/allocators.h \
 		src/qt/messagemodel.h \
@@ -3240,6 +3250,8 @@ build/sendmessagesdialog.o: src/qt/sendmessagesdialog.cpp src/qt/sendmessagesdia
 
 build/sendmessagesentry.o: src/qt/sendmessagesentry.cpp src/qt/sendmessagesentry.h \
 		build/ui_sendmessagesentry.h \
+		src/qt/qvalidatedlineedit.h \
+		src/qt/qvalidatedtextedit.h \
 		src/qt/guiutil.h \
 		src/qt/addressbookpage.h \
 		src/qt/walletmodel.h \

denarius-qt.pro

@@ -16,34 +16,36 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 }
 
-# Windows Dep Libraries, Uncomment lines 20 through 34 to compile Win.
-#BOOST_LIB_SUFFIX=-mgw48-mt-s-1_55
-#BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
-#BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
-#BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
-#BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
-#OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
-#OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
-#MINIUPNPC_INCLUDE_PATH=C:/deps/
-#MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
-#LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.16
-#LIBPNG_LIB_PATH=C:/deps/libpng-1.6.16/.libs
-#QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
-#QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
-
-# OSX Dep Libraries, uncomment line 38 through 53 to compile OSX
-#MINIUPNPC_LIB_PATH=/usr/local/opt/miniupnpc/lib
-#MINIUPNPC_INCLUDE_PATH=/usr/local/opt/miniupnpc/include
-#OPENSSL_LIB_PATH=/usr/local/opt/openssl/lib
-#OPENSSL_INCLUDE_PATH=/usr/local/opt/openssl/include
-#BDB_LIB_PATH=/usr/local/opt/berkeley-db@4/lib
-#BDB_INCLUDE_PATH=/usr/local/opt/berkeley-db@4/include
-#BOOST_LIB_PATH=/usr/local/opt/boost/lib/
-#BOOST_INCLUDE_PATH=/usr/local/opt/boost/include
-#LIBPNG_LIB_PATH=/usr/local/opt/libpng/lib
-#LIBPNG_INCLUDE_PATH=/usr/local/opt/libpng/include
-#QRENCODE_LIB_PATH=/usr/local/opt/qrencode/lib
-#QRENCODE_INCLUDE_PATH=/usr/local/opt/qrencode/include
+win32 {
+BOOST_LIB_SUFFIX=-mgw49-mt-s-1_55
+BOOST_INCLUDE_PATH=C:/deps/boost_1_55_0
+BOOST_LIB_PATH=C:/deps/boost_1_55_0/stage/lib
+BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
+BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
+OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
+OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
+MINIUPNPC_INCLUDE_PATH=C:/deps/
+MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
+LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.16
+LIBPNG_LIB_PATH=C:/deps/libpng-1.6.16/.libs
+QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
+QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
+}
+
+macx {
+MINIUPNPC_LIB_PATH=/usr/local/opt/miniupnpc/lib
+MINIUPNPC_INCLUDE_PATH=/usr/local/opt/miniupnpc/include
+OPENSSL_LIB_PATH=/usr/local/opt/openssl/lib
+OPENSSL_INCLUDE_PATH=/usr/local/opt/openssl/include
+BDB_LIB_PATH=/usr/local/opt/berkeley-db@4/lib
+BDB_INCLUDE_PATH=/usr/local/opt/berkeley-db@4/include
+BOOST_LIB_PATH=/usr/local/opt/boost/lib/
+BOOST_INCLUDE_PATH=/usr/local/opt/boost/include
+LIBPNG_LIB_PATH=/usr/local/opt/libpng/lib
+LIBPNG_INCLUDE_PATH=/usr/local/opt/libpng/include
+QRENCODE_LIB_PATH=/usr/local/opt/qrencode/lib
+QRENCODE_INCLUDE_PATH=/usr/local/opt/qrencode/include
+}
 
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt