From f53cd16a0fc4989c18834f254205bd01cca77b2a Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Mon, 24 Aug 2020 00:42:04 +0200 Subject: [PATCH] Install qml file to datadir Gbp-Pq: Name Install-qml-file-to-datadir.patch --- cmake/BTApplication.cmake | 2 +- src/frontend/display/modelview/btquickwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/BTApplication.cmake b/cmake/BTApplication.cmake index 9c5eaa6..4f3174b 100644 --- a/cmake/BTApplication.cmake +++ b/cmake/BTApplication.cmake @@ -181,7 +181,7 @@ IF(APPLE) DESTINATION "${BT_BINDIR}/BibleTime.app/Contents/MacOS") ELSE() INSTALL(FILES "src/frontend/display/modelview/DisplayView.qml" - DESTINATION "${BT_BINDIR}/") + DESTINATION "${BT_DATADIR}/bibletime/") ENDIF() FILE(GLOB INSTALL_TMPL_LIST diff --git a/src/frontend/display/modelview/btquickwidget.cpp b/src/frontend/display/modelview/btquickwidget.cpp index 5fe3b7e..850d257 100644 --- a/src/frontend/display/modelview/btquickwidget.cpp +++ b/src/frontend/display/modelview/btquickwidget.cpp @@ -36,7 +36,7 @@ BtQuickWidget::BtQuickWidget(BtQmlScrollView* parent) setAcceptDrops(true); namespace DU = util::directory; - QString qmlFile = QCoreApplication::applicationDirPath() + "/" + "DisplayView.qml"; + QString qmlFile = "/usr/share/bibletime/DisplayView.qml"; setSource(QUrl::fromLocalFile(qmlFile)); setupScrollTimer(); } -- 2.30.2