diff --git a/.gitmodules b/.gitmodules index 583184d1fb1c1c33a0b6feaaaae1e0c0004efe81..562c0c5f895f11de9decbb76fabcc5f95b33e104 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "libdap"] - path = libdap - url = https://github.com/kelvinblockchain/libdap.git +[submodule "libdap-qt"] + path = libdap-qt + url = https://github.com/demlabsinc/libdap-qt.git branch = master [submodule "libdap-qt-ui-qml"] path = libdap-qt-ui-qml diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/KelvinDashboardGUI/KelvinDashboardGUI.pro index b5e1638217d56ced55524f86813967e16af62c48..1a7d6d67aa8dbd2f84230023c08b809fe4498606 100755 --- a/KelvinDashboardGUI/KelvinDashboardGUI.pro +++ b/KelvinDashboardGUI/KelvinDashboardGUI.pro @@ -84,10 +84,10 @@ HEADERS += \ DapServiceClientNativeAbstract.h \ DapServiceClientNativeLinux.h - +include (../libdap-qt/libdap-qt.pri) include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri) include (../DapRPCProtocol/DapRPCProtocol.pri) INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/ $$_PRO_FILE_PWD_/../DapRPCProtocol/ - $$_PRO_FILE_PWD_/../libdap/ + $$_PRO_FILE_PWD_/../libdap-qt/ diff --git a/KelvinDashboardService/KelvinDashboardService.pro b/KelvinDashboardService/KelvinDashboardService.pro index 0ab9888b600bdb4e1d73f11a1adc560ccb2f69ea..2fecb7026ec2f05b6798b88948c4d95b7dea139c 100755 --- a/KelvinDashboardService/KelvinDashboardService.pro +++ b/KelvinDashboardService/KelvinDashboardService.pro @@ -47,12 +47,13 @@ HEADERS += \ DapChainNode.h \ DapChainNodeCache.h +include (../libdap-qt/libdap-qt.pri) include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri) include (../DapRPCProtocol/DapRPCProtocol.pri) INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/ $$_PRO_FILE_PWD_/../DapRPCProtocol/ - $$_PRO_FILE_PWD_/../libdap/ + $$_PRO_FILE_PWD_/../libdap-qt/ RESOURCES += \ KelvinDashboardService.qrc diff --git a/libdap b/libdap deleted file mode 160000 index c30973bfe5a3d2eb4201af535cc559b326e8b175..0000000000000000000000000000000000000000 --- a/libdap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c30973bfe5a3d2eb4201af535cc559b326e8b175