summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-08-17 08:52:46 +0200
committerMontel Laurent <[email protected]>2017-08-17 08:52:46 +0200
commita2357a2650a5631f61c98b42e5298227b26eed4e (patch)
tree841b8774caa158ff2ed370936973435076666029
parent6d32863f0acf23d1ae57aed1f08b417e8feefb48 (diff)
Move about html file to qrc
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/about/CMakeLists.txt5
-rw-r--r--src/akregator.qrc5
-rw-r--r--src/articleviewer-ng/webengine/articleviewerwebengine.cpp2
4 files changed, 8 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 50673cc..8d460b3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/frame/
)
-add_subdirectory(about)
add_subdirectory(icons)
@@ -100,6 +99,8 @@ set(akregatorprivate_LIB_SRCS
actions/actions.cpp
)
+qt5_add_resources(akregatorprivate_LIB_SRCS akregator.qrc)
+
add_library(akregatorprivate ${akregatorprivate_LIB_SRCS})
generate_export_header(akregatorprivate BASE_NAME akregator)
diff --git a/src/about/CMakeLists.txt b/src/about/CMakeLists.txt
deleted file mode 100644
index e6d8363..0000000
--- a/src/about/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-install(FILES
- introduction_akregator.html
- DESTINATION ${KDE_INSTALL_DATADIR}/messageviewer/about/default
-)
-
diff --git a/src/akregator.qrc b/src/akregator.qrc
new file mode 100644
index 0000000..b02a3b4
--- /dev/null
+++ b/src/akregator.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>about/introduction_akregator.html</file>
+ </qresource>
+</RCC>
diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
index 71ecfc9..e45510f 100644
--- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
+++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
@@ -128,7 +128,7 @@ QVariantHash ArticleViewerWebEngine::introductionData() const
void ArticleViewerWebEngine::showAboutPage()
{
- paintAboutScreen(QStringLiteral("introduction_akregator.html"), introductionData());
+ paintAboutScreen(QStringLiteral(":/about/introduction_akregator.html"), introductionData());
}
void ArticleViewerWebEngine::paintAboutScreen(const QString &templateName, const QVariantHash &data)