From eacbb28e3b4ea7aa1586172bf9bd473b1882b04c Mon Sep 17 00:00:00 2001 From: "daragan.andrey@demlabs.net" <daragan.andrey@demlabs.net> Date: Fri, 3 May 2019 19:14:13 +0300 Subject: [PATCH] [+] Added DapRPCProtocol. --- KelvinDashboard.pro | 6 ------ KelvinDashboardGUI/KelvinDashboardGUI.pro | 4 ++-- KelvinDashboardService/KelvinDashboardService.pro | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/KelvinDashboard.pro b/KelvinDashboard.pro index 395241d24..8cfdee374 100755 --- a/KelvinDashboard.pro +++ b/KelvinDashboard.pro @@ -9,9 +9,3 @@ KelvinDashboardGUI.depends = KelvinDashboardService { BRAND = KelvinDashboard } - -unix: !mac : !android { - share_target.files = debian/share/* - share_target.path = /opt/dap/$$lower($$BRAND)/share/ - INSTALLS += share_target -} diff --git a/KelvinDashboardGUI/KelvinDashboardGUI.pro b/KelvinDashboardGUI/KelvinDashboardGUI.pro index 44407b812..b5e163821 100755 --- a/KelvinDashboardGUI/KelvinDashboardGUI.pro +++ b/KelvinDashboardGUI/KelvinDashboardGUI.pro @@ -87,7 +87,7 @@ HEADERS += \ include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri) include (../DapRPCProtocol/DapRPCProtocol.pri) + INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/ + $$_PRO_FILE_PWD_/../DapRPCProtocol/ $$_PRO_FILE_PWD_/../libdap/ - -DISTFILES += diff --git a/KelvinDashboardService/KelvinDashboardService.pro b/KelvinDashboardService/KelvinDashboardService.pro index 212499b4e..0ab9888b6 100755 --- a/KelvinDashboardService/KelvinDashboardService.pro +++ b/KelvinDashboardService/KelvinDashboardService.pro @@ -49,10 +49,10 @@ HEADERS += \ include (../libKelvinDashboardCommon/libKelvinDashboardCommon.pri) include (../DapRPCProtocol/DapRPCProtocol.pri) + INCLUDEPATH += $$_PRO_FILE_PWD_/../libKelvinDashboardCommon/ + $$_PRO_FILE_PWD_/../DapRPCProtocol/ $$_PRO_FILE_PWD_/../libdap/ RESOURCES += \ KelvinDashboardService.qrc - -DISTFILES += -- GitLab