From e791b81686cf685aac2f7e079763c67bc7ffaf53 Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Fri, 22 Jan 2021 14:36:39 +0100
Subject: [PATCH] chatview: avoid fixed paths and windows dependent names
Change-Id: Ie14cd8423e5d8e284a08f66df224ef426fdc00da
---
CMakeLists.txt | 6 ++++++
.../{chatview-windows.css => chatview-qt.css} | 0
src/webresource.qrc | 12 ++++++++++++
webresource.qrc | 12 ------------
4 files changed, 18 insertions(+), 12 deletions(-)
rename src/web-chatview/{chatview-windows.css => chatview-qt.css} (100%)
create mode 100644 src/webresource.qrc
delete mode 100644 webresource.qrc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 196012a7..6e690f90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -376,6 +376,7 @@ SET(libringclient_api_LIB_HDRS
SET(libringclient_WEB_chatview
src/web-chatview/.eslintrc.json
src/web-chatview/chatview-gnome.css
+ src/web-chatview/chatview-qt.css
src/web-chatview/chatview.css
src/web-chatview/chatview.html
src/web-chatview/chatview.js
@@ -649,6 +650,11 @@ INSTALL( FILES ${libringclient_WEB_chatview}
COMPONENT Devel
)
+INSTALL( FILES src/webresource.qrc
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libringclient
+ COMPONENT Devel
+)
+
INSTALL( FILES ${libringclient_extensions_LIB_HDRS}
DESTINATION ${INCLUDE_INSTALL_DIR}/libringclient/extensions
COMPONENT Devel
diff --git a/src/web-chatview/chatview-windows.css b/src/web-chatview/chatview-qt.css
similarity index 100%
rename from src/web-chatview/chatview-windows.css
rename to src/web-chatview/chatview-qt.css
diff --git a/src/webresource.qrc b/src/webresource.qrc
new file mode 100644
index 00000000..54d947fc
--- /dev/null
+++ b/src/webresource.qrc
@@ -0,0 +1,12 @@
+<RCC>
+ <qresource prefix="/">
+ <file alias="chatview.css">web-chatview/chatview.css</file>
+ <file alias="chatview.html">web-chatview/chatview.html</file>
+ <file alias="chatview.js">web-chatview/chatview.js</file>
+ <file alias="linkify.js">web-chatview/linkify.js</file>
+ <file alias="linkify-html.js">web-chatview/linkify-html.js</file>
+ <file alias="linkify-string.js">web-chatview/linkify-string.js</file>
+ <file alias="qwebchannel.js">web-chatview/qwebchannel.js</file>
+ <file alias="chatview-windows.css">web-chatview/chatview-qt.css</file>
+ </qresource>
+</RCC>
diff --git a/webresource.qrc b/webresource.qrc
deleted file mode 100644
index cd571f57..00000000
--- a/webresource.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file alias="chatview.css">src/web-chatview/chatview.css</file>
- <file alias="chatview.html">src/web-chatview/chatview.html</file>
- <file alias="chatview.js">src/web-chatview/chatview.js</file>
- <file alias="linkify.js">src/web-chatview/linkify.js</file>
- <file alias="linkify-html.js">src/web-chatview/linkify-html.js</file>
- <file alias="linkify-string.js">src/web-chatview/linkify-string.js</file>
- <file alias="qwebchannel.js">src/web-chatview/qwebchannel.js</file>
- <file alias="chatview-windows.css">src/web-chatview/chatview-windows.css</file>
- </qresource>
-</RCC>
--
GitLab