Make Qt wallet compile

CMakeLists.txt

@@ -6,6 +6,10 @@ find_package(Boost COMPONENTS thread program_options unit_test_framework REQUIRE
 find_package(OpenSSL REQUIRED)
 find_package(BDB REQUIRED)
 find_package(CURL REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Protobuf REQUIRED)
 
 add_definitions(-DHAVE_ENDIAN_H=1)
 add_definitions(-DHAVE_DECL_HTOBE16=1)
@@ -20,6 +24,9 @@ add_definitions(-DHAVE_DECL_HTOBE64=1)
 add_definitions(-DHAVE_DECL_HTOLE64=1)
 add_definitions(-DHAVE_DECL_BE64TOH=1)
 add_definitions(-DHAVE_DECL_LE64TOH=1)
+add_definitions(-DHAVE_DECL_BSWAP_16=1)
+add_definitions(-DHAVE_DECL_BSWAP_32=1)
+add_definitions(-DHAVE_DECL_BSWAP_64=1)
 
 add_definitions(-DHAVE_WORKING_BOOST_SLEEP_FOR=1)
 
@@ -37,4 +44,5 @@ add_subdirectory(src/univalue)
 add_subdirectory(src/secp256k1)
 add_subdirectory(src/test)
 add_subdirectory(src)
+add_subdirectory(src/qt)
 

src/CMakeLists.txt

@@ -383,19 +383,5 @@ target_link_libraries(crownd
   OpenSSL::SSL
   BDB::bdb
   curl
-)  
-
-#if TARGET_WINDOWS
-#crownd_SOURCES += crownd-res.rc
-#endif
-
-add_executable(crown_qt
-  qt/crown.cpp)
+)
 
-target_link_libraries(crown_qt
-  crown_core
-  crown_server
-  crown_common
-  crown_util
-  crown_crypto
-  crown_univalue)
\ No newline at end of file

src/qt/CMakeLists.txt

+protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS paymentrequest.proto)
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+qt5_wrap_ui(UI_HEADERS
+  forms/addressbookpage.ui
+  forms/askpassphrasedialog.ui
+  forms/coincontroldialog.ui
+  forms/editaddressdialog.ui
+  forms/helpmessagedialog.ui
+  forms/intro.ui
+  forms/openuridialog.ui
+  forms/optionsdialog.ui
+  forms/overviewpage.ui
+  forms/receivecoinsdialog.ui
+  forms/receiverequestdialog.ui
+  forms/rpcconsole.ui
+  forms/sendcoinsdialog.ui
+  forms/sendcoinsentry.ui
+  forms/signverifymessagedialog.ui
+  forms/masternodelist.ui
+  forms/systemnodelist.ui
+  forms/transactiondescdialog.ui
+  forms/multisigaddressentry.ui
+  forms/multisigdialog.ui
+  forms/multisiginputentry.ui
+  forms/createnodedialog.ui
+  forms/startmissingdialog.ui
+  forms/updatedialog.ui
+  )
+
+add_library(crownqtlib
+  bitcoinaddressvalidator.cpp
+  bitcoinamountfield.cpp
+  bitcoingui.cpp
+  bitcoinunits.cpp
+  clientmodel.cpp
+  csvmodelwriter.cpp
+  guiutil.cpp
+  intro.cpp
+  multisigaddressentry.cpp
+  multisigdialog.cpp
+  multisiginputentry.cpp
+  networkstyle.cpp
+  notificator.cpp
+  optionsdialog.cpp
+  optionsmodel.cpp
+  peertablemodel.cpp
+  qvalidatedlineedit.cpp
+  qvaluecombobox.cpp
+  rpcconsole.cpp
+  splashscreen.cpp
+  trafficgraphwidget.cpp
+  utilitydialog.cpp
+  winshutdownmonitor.cpp
+  addressbookpage.cpp
+  addresstablemodel.cpp
+  askpassphrasedialog.cpp
+  coincontroldialog.cpp
+  coincontroltreewidget.cpp
+  editaddressdialog.cpp
+  openuridialog.cpp
+  overviewpage.cpp
+  paymentrequestplus.cpp
+  paymentserver.cpp
+  receivecoinsdialog.cpp
+  receiverequestdialog.cpp
+  recentrequeststablemodel.cpp
+  sendcoinsdialog.cpp
+  sendcollateraldialog.cpp
+  sendcoinsentry.cpp
+  signverifymessagedialog.cpp
+  masternodelist.cpp
+  systemnodelist.cpp
+  datetablewidgetitem.cpp
+  privatekeywidget.cpp
+  createnodedialog.cpp
+  startmissingdialog.cpp
+  transactiondesc.cpp
+  transactiondescdialog.cpp
+  transactionfilterproxy.cpp
+  transactionrecord.cpp
+  transactiontablemodel.cpp
+  transactionview.cpp
+  walletframe.cpp
+  walletmodel.cpp
+  walletmodeltransaction.cpp
+  walletview.cpp
+  updatedialog.cpp
+  addressbookpage.h
+  addresstablemodel.h
+  askpassphrasedialog.h
+  bitcoinaddressvalidator.h
+  bitcoinamountfield.h
+  bitcoingui.h
+  bitcoinunits.h
+  clientmodel.h
+  coincontroldialog.h
+  coincontroltreewidget.h
+  csvmodelwriter.h
+  editaddressdialog.h
+  guiconstants.h
+  guiutil.h
+  intro.h
+#  macdockiconhandler.h
+#  macnotificationhandler.h
+  networkstyle.h
+  notificator.h
+  openuridialog.h
+  optionsdialog.h
+  optionsmodel.h
+  overviewpage.h
+  paymentrequestplus.h
+  paymentserver.h
+  peertablemodel.h
+  qvalidatedlineedit.h
+  qvaluecombobox.h
+  receivecoinsdialog.h
+  receiverequestdialog.h
+  recentrequeststablemodel.h
+  rpcconsole.h
+  sendcoinsdialog.h
+  sendcoinsentry.h
+  sendcollateraldialog.h
+  signverifymessagedialog.h
+  splashscreen.h
+  masternodelist.h
+  systemnodelist.h
+  datetablewidgetitem.h
+  privatekeywidget.h
+  createsystemnodedialog.h
+  createmasternodedialog.h
+  createnodedialog.h
+  startmissingdialog.h
+  trafficgraphwidget.h
+  transactiondesc.h
+  transactiondescdialog.h
+  transactionfilterproxy.h
+  transactionrecord.h
+  transactiontablemodel.h
+  transactionview.h
+  utilitydialog.h
+  walletframe.h
+  walletmodel.h
+  walletmodeltransaction.h
+  walletview.h
+  winshutdownmonitor.h
+  multisigaddressentry.h
+  multisigdialog.h
+  multisiginputentry.h
+  updatedialog.h
+  ${UI_HEADERS}
+  ${PROTO_SRCS}
+  ${PROTO_HDRS}
+  )
+target_include_directories(crownqtlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PRIVATE qt)
+
+target_link_libraries(crownqtlib
+  crown_util
+  crown_cli
+  leveldb
+  Qt5::Widgets
+  Qt5::Network
+  )
+#if TARGET_WINDOWS
+#crownd_SOURCES += crownd-res.rc
+#endif
+qt5_add_translation(QM
+  locale/crown_bg.ts
+  locale/crown_cs.ts
+  locale/crown_de.ts
+  locale/crown_en.ts
+  locale/crown_es.ts
+  locale/crown_fi.ts
+  locale/crown_fr.ts
+  locale/crown_it.ts
+  locale/crown_ja.ts
+  locale/crown_pl.ts
+  locale/crown_pt.ts
+  locale/crown_ru.ts
+  locale/crown_sk.ts
+  locale/crown_sv.ts
+  locale/crown_vi.ts
+  locale/crown_zh_CN.ts
+  locale/crown_zh_TW.ts
+  )
+
+message(${QM})
+qt5_add_resources(QRCS
+  crown.qrc
+#  crown_locale.qrc
+  )
+add_executable(crown_qt
+  ${QM}
+  ${QRCS}
+  crown.cpp)
+
+target_link_libraries(crown_qt
+  crown_core
+  crown_server
+  crown_common
+  crown_util
+  crown_crypto
+  crown_univalue
+  crown_cli
+  crownqtlib
+  Qt5::Widgets
+  protobuf::libprotobuf
+  protobuf::libprotobuf-lite
+  )

src/qt/crown.cpp

@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
 #endif
 
     Q_INIT_RESOURCE(crown);
-    Q_INIT_RESOURCE(crown_locale);
+//    Q_INIT_RESOURCE(crown_locale);
 
     BitcoinApplication app(argc, argv);
 #if QT_VERSION > 0x050100

src/qt/crown_locale.qrc

 <!DOCTYPE RCC><RCC version="1.0">
     <qresource prefix="/translations">
-        <file alias="bg">locale/crown_bg.qm</file>
-        <file alias="cs">locale/crown_cs.qm</file>
-        <file alias="de">locale/crown_de.qm</file>
-        <file alias="en">locale/crown_en.qm</file>
-        <file alias="es">locale/crown_es.qm</file>
-        <file alias="fi">locale/crown_fi.qm</file>
-        <file alias="fr">locale/crown_fr.qm</file>
-        <file alias="it">locale/crown_it.qm</file>
-        <file alias="ja">locale/crown_ja.qm</file>
-        <file alias="pl">locale/crown_pl.qm</file>
-        <file alias="pt">locale/crown_pt.qm</file>
-        <file alias="ru">locale/crown_ru.qm</file>
-        <file alias="sk">locale/crown_sk.qm</file>
-        <file alias="sv">locale/crown_sv.qm</file>
-        <file alias="vi">locale/crown_vi.qm</file>
-        <file alias="zh_CN">locale/crown_zh_CN.qm</file>
-        <file alias="zh_TW">locale/crown_zh_TW.qm</file>
     </qresource>
 </RCC>