From 1eeb334a8f137de4e774a0f07d42668b12d69bae Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 31 May 2019 10:14:10 +0200
Subject: [PATCH] Fixed sdrbase resource init

---
 sdrbase/CMakeLists.txt                    | 2 +-
 sdrbase/resources/{res.qrc => webapi.qrc} | 0
 sdrbase/webapi/webapirequestmapper.cpp    | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename sdrbase/resources/{res.qrc => webapi.qrc} (100%)

diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index f750f858e..0920d0865 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -143,7 +143,7 @@ set(sdrbase_SOURCES
 
     mainparser.cpp
 
-    resources/res.qrc
+    resources/webapi.qrc
 )
 
 set(sdrbase_HEADERS
diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/webapi.qrc
similarity index 100%
rename from sdrbase/resources/res.qrc
rename to sdrbase/resources/webapi.qrc
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 3a8c52117..5a2190ccc 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -49,6 +49,7 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) :
     HttpRequestHandler(parent),
     m_adapter(0)
 {
+    Q_INIT_RESOURCE(webapi);
     qtwebapp::HttpDocrootSettings docrootSettings;
     docrootSettings.path = ":/webapi";
     m_staticFileController = new qtwebapp::StaticFileController(docrootSettings, parent);
@@ -57,6 +58,7 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) :
 WebAPIRequestMapper::~WebAPIRequestMapper()
 {
     delete m_staticFileController;
+    Q_CLEANUP_RESOURCE(webapi);
 }
 
 void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)